Commit Graph
2074 Commits
Author SHA1 Message Date
liumengyi c26c9dc110 * Optimize code for task #58288. 2022-06-23 09:39:29 +08:00
liumengyi 4c5ff19a61 * Finish task #58288. 2022-06-22 17:01:39 +08:00
liumengyi b7a32b354b * Finish task #58288. 2022-06-22 16:15:06 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
孙广明 34ddc497ba Merge branch 'zentaopms_207' 2022-06-22 08:33:17 +08:00
朱金勇 89357c1100 Merge branch 'sprint/wangzemei/bug23265' into 'master'
* Fix bug #23265

See merge request easycorp/zentaopms!4045
2022-06-22 00:15:59 +00:00
hufangzhou adad8ea3ae * Finish task #57882, #57874, #57873, #57855. 2022-06-21 17:30:36 +08:00
wangzemei 0f30bd5fd9 * Fix bug #23265 2022-06-21 09:11:46 +00:00
孙广明 dab3b7eab2 Merge branch 'sprint/207_mayue_bug#23765' into 'zentaopms_207'
* Fix bug #23765.

See merge request easycorp/zentaopms!4037
2022-06-21 07:24:12 +00:00
王怡栋 83ecf656d3 Merge branch 'sgm_parentplan' into 'master'
* Code for feedback #397.

See merge request easycorp/zentaopms!4033

(cherry picked from commit beaddb012c)

f0c23584 * Code for feedback #397.
2022-06-21 06:28:13 +00:00
王怡栋 c30ba304ab Revert "Merge branch 'sgm_parentplan' into 'master'"
This reverts merge request !4033
2022-06-21 06:25:45 +00:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
孙广明 f0c23584e0 * Code for feedback #397. 2022-06-21 10:23:58 +08:00
孙广明 642b518397 Merge branch 'codeReview' into 'master'
codeReview

See merge request easycorp/zentaopms!4004
2022-06-17 07:11:23 +00:00
sunjun ca2b45736b codeReview 2022-06-17 07:04:52 +00:00
tianshujie d95a2fee68 * Fix bug #23918. 2022-06-17 14:59:22 +08:00
孙广明 b52ef1c426 Merge branch 'sprint/204_tianshujie_optimize' into 'master'
* Optimize the code.

See merge request easycorp/zentaopms!4005
2022-06-17 05:16:52 +00:00
tianshujie 33cecbfcd3 * Optimize the code. 2022-06-17 13:14:55 +08:00
sunjun fec9f4f1dd codeReview 2022-06-17 05:05:44 +00:00
Hao Sun 834689d226 * bug #23877, fix user picker not work as expected. 2022-06-17 04:04:28 +00:00
王怡栋 3264102179 Merge branch 'sprint202_leiyong_fix_bug_23841' into 'master'
* Fix bug#23841.

See merge request easycorp/zentaopms!3997
2022-06-17 02:07:06 +00:00
leiyong a87a9bc2fb * Edit comments. 2022-06-17 02:06:02 +00:00
xieqiyu d0ac2813ec * Fix bug#23725. 2022-06-17 09:55:30 +08:00
leiyong ae55e2c31e * Fix bug#23841. 2022-06-17 01:30:09 +00:00
王怡栋 85339e8d1e Merge branch 'sprint202_leiyong_fix_bug_23821' into 'master'
* Fix bug#23821.

See merge request easycorp/zentaopms!3995
2022-06-17 00:33:53 +00:00
leiyong 80c03beea7 * Fix bug#23821. 2022-06-16 11:16:17 +00:00
孙广明 3f83669de2 Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Fix bug#23707.

See merge request easycorp/zentaopms!3992
2022-06-16 09:28:33 +00:00
leiyong f4e3a0dc61 * Fix bug#23707. 2022-06-16 09:14:11 +00:00
王怡栋 bd1dc044d1 Merge branch 'master_xieqiyu_23829' into 'master'
* Fix bug#23829.

See merge request easycorp/zentaopms!3972
2022-06-16 09:03:35 +00:00
王怡栋 af2b0ef327 Merge branch 'master_xieqiyu_23762' into 'master'
* Fix bug#23762.

See merge request easycorp/zentaopms!3989
2022-06-16 09:03:19 +00:00
王怡栋 4bf221548e Merge branch 'master_xieqiyu_23797' into 'master'
* Fix bug#23797.

See merge request easycorp/zentaopms!3981
2022-06-16 09:02:23 +00:00
xieqiyu e0a9d3b339 * Fix bug#23762. 2022-06-16 16:56:57 +08:00
sunjun 8b4d326b90 fixissue_planIcon 2022-06-16 07:57:40 +00:00
xieqiyu 783d4471b0 * Fix bug#23797. 2022-06-16 15:50:25 +08:00
liumengyi e4b44a2b05 * Fix issue #678. 2022-06-16 14:18:29 +08:00
xieqiyu e33c963505 * Fix bug#23829. 2022-06-16 13:33:23 +08:00
tianshujie d351c15090 * Fix bug #23828. 2022-06-16 13:23:57 +08:00
王怡栋 ae6f603d1e Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug about kanban's setLane.

See merge request easycorp/zentaopms!3969
2022-06-16 05:02:33 +00:00
zhouxudong 85fc6dec5d * Fix bug about kanban's setLane. 2022-06-16 04:05:54 +00:00
caoyanyi 8d16be79c4 * Modify page locate. 2022-06-16 12:04:06 +08:00
王怡栋 9f7840a2d7 Merge branch 'sprint/204_liumengyi_677' into 'master'
* Fix issue #677.

See merge request easycorp/zentaopms!3966
2022-06-16 03:28:18 +00:00
liumengyi d369332447 * Fix issue #677. 2022-06-16 11:25:41 +08:00
tianshujie 6848485eb4 * Finish task #57095. 2022-06-16 11:05:01 +08:00
tianshujie b3e240eda5 * Finish task #57095. 2022-06-16 10:29:31 +08:00
tianshujie da9801d9eb * Finish task #57095. 2022-06-16 09:08:05 +08:00
tianshujie 061e25fd51 * Finish task #57095. 2022-06-16 08:53:15 +08:00
王怡栋 26ab6bfb4c Merge branch 'leiyong_fix_bug_23432' into 'master'
* Finish task#56932.

See merge request easycorp/zentaopms!3958
2022-06-16 00:37:19 +00:00
王怡栋 a79c6bab16 Merge branch 'master_xieqiyu_23657' into 'master'
* Fix bug#23657.

See merge request easycorp/zentaopms!3957
2022-06-16 00:36:14 +00:00
tianshujie cdc590c16b * Finish task #57095. 2022-06-16 08:27:34 +08:00
xieqiyu 16ea32d744 * Fix bug#23657. 2022-06-16 08:18:00 +08:00