Commit Graph
3552 Commits
Author SHA1 Message Date
caoyanyi 8c97159cdc Merge branch 'master' into zenops_46 2022-11-29 08:31:29 +08:00
liuyongkai 9455b09e17 * Resolve feedback #1459. 2022-11-28 14:55:02 +08:00
liuyongkai 64fb4c10ca * Resolve feedback #1459. 2022-11-28 14:15:58 +08:00
caoyanyi fc95313a40 Merge branch 'master' into zenops_46 2022-11-28 08:41:37 +08:00
tanghucheng 8f20075c51 * Fix bug #30282. 2022-11-25 16:12:51 +08:00
mayue fc4abe395d * Fix bug #30096. 2022-11-24 16:10:19 +08:00
caoyanyi 4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +08:00
mayue c0879ef983 * Fix bug #30021. 2022-11-23 16:16:06 +08:00
xieqiyu 37122bb5a8 * Fix bug#30056. 2022-11-23 09:34:21 +08:00
lanzongjun a11d496c0b * Fix Task #77261 2022-11-22 16:55:48 +08:00
lanzongjun 314ab3224a * Fix Task #77261 2022-11-22 16:54:01 +08:00
lanzongjun 1d4a337af8 * Fix Task #77262 2022-11-22 16:49:32 +08:00
lanzongjun 284b748e7a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-11-22 15:45:19 +08:00
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
lanzongjun 740e3e673b * Fix Task #77260 2022-11-22 15:35:34 +08:00
Yagami ae3bbae974 * Finish task #76491. 2022-11-22 13:21:44 +08:00
mayue 74f26f478f * Fix bug #28841. 2022-11-22 09:15:08 +08:00
mayue 35f916be0e * Fix bug #29681. 2022-11-21 13:44:16 +08:00
王怡栋 3852627523 * fix bug #29557. 2022-11-21 11:30:59 +08:00
Yagami adb1434d5b * Finish task #76491. 2022-11-21 09:31:09 +08:00
王怡栋 40e9827d45 Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6260
2022-11-18 08:29:41 +00:00
王怡栋 29cddd773a * fix bug #75779. 2022-11-18 16:25:14 +08:00
tianshujie 5a0280b506 * Fix bug #29923. 2022-11-18 14:22:08 +08:00
caoyanyi f551d44dc8 * Modify pri style. 2022-11-18 11:26:18 +08:00
孙广明 0e8063d20c Merge branch 'master_xieqiyu_29909' into 'master'
* Fix bug#29909.

See merge request easycorp/zentaopms!6220
2022-11-17 08:08:49 +00:00
xieqiyu d2771d367b * Fix bug#29941. 2022-11-17 15:15:20 +08:00
王怡栋 4594970a5b Merge branch 'zentaopms_258_bug#29636' into 'master'
Zentaopms 258 bug#29636

See merge request easycorp/zentaopms!6217
2022-11-17 06:51:50 +00:00
mayue 55947f4fec * Fix bug #29428. 2022-11-17 14:49:32 +08:00
caoyanyi b40d86d219 Merge branch 'master' into zenops_46 2022-11-17 14:42:05 +08:00
xieqiyu df629b33bf * Fix bug#29940. 2022-11-17 11:08:59 +08:00
xieqiyu 6039c833a2 * Fix bug#29909. 2022-11-17 11:02:07 +08:00
wangyuting 2a780454cf * Optimize code. 2022-11-17 02:14:31 +00:00
wangyuting 911a809057 * Fix bug #29636. 2022-11-17 02:09:17 +00:00
王怡栋 8ae7bd1a00 Merge branch 'sprint/zentaopms262_mayue_bug#28841' into 'master'
* Fix bug #28841.

See merge request easycorp/zentaopms!6208
2022-11-17 02:02:55 +00:00
mayue f08a8ccf92 * Remove story stage for edit. 2022-11-17 10:01:34 +08:00
lanzongjun f7506fa050 * Fix task #76408 2022-11-17 09:23:02 +08:00
mayue 617ebf6d8d * Fix bug #28841. 2022-11-17 08:45:30 +08:00
xieqiyu 982cc38e5f * Fix bug#29540. 2022-11-16 16:15:26 +08:00
王怡栋 9e0c3de9da Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
change story

See merge request easycorp/zentaopms!6188
2022-11-16 07:26:11 +00:00
王怡栋 2bb3cd3371 Merge branch 'fixbug' 2022-11-16 13:08:00 +08:00
王怡栋 d3e3335599 * fix bug #29727. 2022-11-16 13:03:50 +08:00
caoyanyi e60b21e1b6 Merge branch 'master' into zenops_46 2022-11-16 13:00:45 +08:00
lanzongjun 9e0ac41d78 change story 2022-11-16 11:31:21 +08:00
tanghucheng 3ce0869e1a * Replace '' to helper::dbIN for release linkStory. 2022-11-16 11:28:40 +08:00
tanghucheng 47398d1cf0 * Fix bug #29869. 2022-11-16 10:52:53 +08:00
lanzongjun b18918ad22 * finish task #75921 2022-11-16 09:36:11 +08:00
lanzongjun 2f7e39685c * finish task #75921 2022-11-16 09:34:31 +08:00
孙广明 d18d4c8a44 Merge branch 'sprint/zentaopms262_mayue_bug#29682' into 'master'
* Fix bug #29682.

See merge request easycorp/zentaopms!6157
2022-11-15 07:55:33 +00:00
王怡栋 60f27fc682 Merge branch 'master_xieqiyu_75905' into 'master'
* Fix bug#29449.

See merge request easycorp/zentaopms!6145
2022-11-15 07:38:34 +00:00
mayue 146559bc2d * Fix bug #29682. 2022-11-15 13:57:03 +08:00