Commit Graph
2040 Commits
Author SHA1 Message Date
sunjun 8b4d326b90 fixissue_planIcon 2022-06-16 07:57:40 +00:00
liumengyi e4b44a2b05 * Fix issue #678. 2022-06-16 14:18:29 +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
leiyong fcd6f4c333 * Finish task#56932. 2022-06-15 10:57:05 +00:00
王怡栋 95df7b5e3c Merge branch 'master_xieqiyu_23662' into 'master'
* Fix bug#23662.

See merge request easycorp/zentaopms!3949
2022-06-15 09:32:05 +00:00
王怡栋 f064336c1f Merge branch 'sprint/tianshujie_57095' into 'master'
* Finish task #57095.

See merge request easycorp/zentaopms!3951
2022-06-15 09:28:49 +00:00
王怡栋 4985d76009 Merge branch 'sprint/hufangzhou_56361' into 'master'
* Finish task #56361.

See merge request easycorp/zentaopms!3945
2022-06-15 09:28:14 +00:00
tianshujie 4fcf0b7dc3 * Finish task #57095. 2022-06-15 17:26:39 +08:00
xieqiyu f460aa58fd * Fix bug#23662. 2022-06-15 17:07:18 +08:00
孙广明 1f13b14799 Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
#   module/execution/css/all.css
2022-06-15 09:03:47 +00:00
tianshujie b6a1b3eb79 * Finish task #57095. 2022-06-15 16:55:28 +08:00
tianshujie 1f0f1ff36e * Finish task #57095. 2022-06-15 16:52:26 +08:00
tianshujie 7f000fd968 * Finish task #57095. 2022-06-15 16:41:12 +08:00
王怡栋 a6b264d1a7 Merge branch 'sprint202_leiyong_task_56926' into 'master'
Sprint202 leiyong task 56926

See merge request easycorp/zentaopms!3942
2022-06-15 08:20:11 +00:00
tianshujie 520ab92338 * Finish task #57095. 2022-06-15 16:17:16 +08:00
hufangzhou d83ce3c27c * Can't post the disabled value to rear end. 2022-06-15 16:06:39 +08:00
leiyong 32b846cdf5 * Finish task#56926. 2022-06-15 07:57:50 +00:00
孙广明 97d6c0bca9 Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Fix bug #23744.

See merge request easycorp/zentaopms!3935
2022-06-15 07:19:56 +00:00
liumengyi 764d54148d * Fix bug 23744. 2022-06-15 15:18:47 +08:00
hufangzhou 9b32199272 * Finish task #56361. 2022-06-15 15:11:41 +08:00
tianshujie 2c176439d3 * Finish task #57095. 2022-06-15 15:09:34 +08:00
liumengyi 5054fd14b2 * Optimize code. 2022-06-15 15:08:58 +08:00
liumengyi a77547cfa6 * Optimize code. 2022-06-15 15:07:58 +08:00
liumengyi f75c14ea54 * Fix bug #23744. 2022-06-15 15:04:31 +08:00
王怡栋 0a6decf08a Merge branch 'sgm_details' into 'master'
* Code for sprint code width.

See merge request easycorp/zentaopms!3933
2022-06-15 06:27:03 +00:00
王怡栋 3318147874 Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Fix bug #23744.

See merge request easycorp/zentaopms!3931
2022-06-15 05:59:21 +00:00
liumengyi 023eaedf83 * Fix bug #23744. 2022-06-15 13:57:12 +08:00
孙广明 d568e34896 * Code for sprint code width. 2022-06-15 13:53:06 +08:00
孙广明 80a39e398d Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Fix bug #23738.

See merge request easycorp/zentaopms!3930
2022-06-15 05:27:13 +00:00
liumengyi 23be41cd71 * Fix bug #23738. 2022-06-15 13:25:41 +08:00
孙广明 9df2853a61 Merge branch 'sprint_204_57094' into 'master'
Sprint 204 57094

See merge request easycorp/zentaopms!3928
2022-06-15 03:09:37 +00:00
sunjun 1ff7d29c99 sprint_204_57094 2022-06-15 03:07:20 +00:00
sunjun b4c2ecbb2f sprint_204_57094 2022-06-15 03:02:18 +00:00
王怡栋 043aed24ec Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Finish task  #57089, #57099.

See merge request easycorp/zentaopms!3927
2022-06-15 02:21:35 +00:00
liumengyi 8a8666f158 * Finish task #57099. 2022-06-15 10:06:26 +08:00
liumengyi 9a74ea6d5d * Fix bug of task #57089. 2022-06-15 10:05:52 +08:00
sunjun a99aed925f sprint_204_57094 2022-06-15 01:42:06 +00:00