Commit Graph
24694 Commits
Author SHA1 Message Date
liumengyi 869d0cc97e * Finish task #43909. 2021-11-11 09:20:48 +08:00
liumengyi 3a53874c1c * Finish task #43909. 2021-11-11 09:13:50 +08:00
liumengyi 85f2a10cbd * Finish task #43909. 2021-11-11 09:07:49 +08:00
liumengyi 2182c4dee5 * Finish task #43909. 2021-11-11 08:55:29 +08:00
liumengyi 651af21958 * Finish task #43909. 2021-11-10 13:09:09 +08:00
liumengyi a76e32591e * Finish task #43909. 2021-11-10 11:30:04 +08:00
liumengyi 6bdf3553d1 * Finish task#43909. 2021-11-10 09:05:58 +08:00
liumengyi 7203acb7af * Finish task#43909. 2021-11-09 17:25:14 +08:00
liumengyi ed537c1415 * Finish task#43909. 2021-11-09 17:22:09 +08:00
tianshujie 9e622a2995 * Merge conflicts. 2021-11-09 16:27:06 +08:00
李玉春 98f519fe31 Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901'
# Conflicts:
#   module/branch/model.php
#   module/story/model.php
2021-11-09 07:53:17 +00:00
tianshujie 8e9dd74c0d * Modify code logic. 2021-11-09 15:47:31 +08:00
root f49cbba01d * Fix bug #15665 2021-11-09 14:38:14 +08:00
tianshujie 5ab6fe77c2 * Modify code logic. 2021-11-09 14:21:17 +08:00
李玉春 d75156dd74 Merge branch 'sprint/170_songchenxuan_43918' into 'sprint/170'
* Finish task #43918.

See merge request easycorp/zentaopms!361
2021-11-09 06:00:23 +00:00
root 397fb3e152 Finish task #43918. 2021-11-09 13:58:39 +08:00
孙广明 90ca341898 Merge branch 'sprint/170_zhengrunyu_44157' into 'sprint/170'
*Finish task #44157.

See merge request easycorp/zentaopms!362
2021-11-09 05:58:09 +00:00
zhengrunyu 411d2429ee Finish task #44157. 2021-11-09 13:55:56 +08:00
zhengrunyu 928784c9a9 Finish task #44157. 2021-11-09 13:52:13 +08:00
zhengrunyu 0f975ee3c4 *Finish task #44157. 2021-11-09 13:48:06 +08:00
root 782d1114bf Finish task #43918. 2021-11-09 13:47:30 +08:00
zhengrunyu 57bc70b75b *Finish task #44157. 2021-11-09 13:31:05 +08:00
root 44c44f11d1 Finish task #43918. 2021-11-09 13:25:52 +08:00
root f23ff798b9 Finish task #43918. 2021-11-09 13:23:37 +08:00
root 627ba8e493 Finish task #43918. 2021-11-09 13:18:44 +08:00
root 8c731d67fe Finish task #43918. 2021-11-09 13:14:05 +08:00
root fdc54380ee * Finish task #43918. 2021-11-09 13:08:58 +08:00
root c0169fd823 * Finish task #43918. 2021-11-09 11:27:30 +08:00
root ab5ee93bc3 * Finish task #43918. 2021-11-09 11:26:25 +08:00
孙广明 9d135336e8 Merge branch 'sprint/170_hufangzhou_43891' into 'sprint/170'
* Code for task #43891.

See merge request easycorp/zentaopms!360
2021-11-09 03:15:37 +00:00
hufangzhou 9c7884d905 * Code for task #43891. 2021-11-09 11:09:48 +08:00
root 67635b0317 * Finish task #43918. 2021-11-09 10:39:02 +08:00
root c55a455a16 * Finish task #43918. 2021-11-09 10:37:48 +08:00
root 33539633d7 * Finish task #43918. 2021-11-09 10:35:17 +08:00
tianshujie eedcc1aed5 * Modify code logic. 2021-11-09 10:28:16 +08:00
tianshujie 3986d8c297 * Add the logic of project-related multi-branch products. 2021-11-09 10:04:05 +08:00
李玉春 b9bdc8a517 Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.

See merge request easycorp/zentaopms!356
2021-11-09 01:49:16 +00:00
mayue cafb5d08a8 * Fix bug #15688. 2021-11-09 09:47:10 +08:00
mayue 6c23d4a336 * Fix bug #15688. 2021-11-09 09:37:33 +08:00
xieqiyu 1c4840c2c0 * Fix a bug. 2021-11-09 09:11:16 +08:00
root b9dc220fd9 * Finish task #43918 2021-11-09 08:35:27 +08:00
李玉春 ddbc2d2342 Merge branch 'sprint/170_xieqiyu_16058' into 'sprint/170'
* Fix bug#16058.

See merge request easycorp/zentaopms!352
2021-11-09 00:33:26 +00:00
xieqiyu e53d644169 * Fix bug#16058. 2021-11-08 19:13:09 +08:00
hufangzhou d10834ab9f * Code for task #43904. 2021-11-08 18:02:15 +08:00
李玉春 b778d246c2 Merge branch 'sprint/170_xieqiyu_16051' into 'sprint/170'
* Fix bug#16051.

See merge request easycorp/zentaopms!344
2021-11-08 09:34:43 +00:00
xieqiyu 8f2deab146 * Adjust code style. 2021-11-08 17:22:29 +08:00
hufangzhou 1d7c3b30c5 * Fix bug #16065. 2021-11-08 17:14:35 +08:00
hufangzhou c027028759 * Finish task #43899. 2021-11-08 16:44:42 +08:00
xieqiyu 74c1b31476 * Fix bug#16051. 2021-11-08 16:37:19 +08:00
hufangzhou 9f27d5918b * Fix bug #16062. 2021-11-08 16:29:22 +08:00