Commit Graph
1952 Commits
Author SHA1 Message Date
xieqiyu d69d68f9bd * Fix bug#26045. 2022-08-04 13:34:09 +08:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
zhouxudong 84f3796c88 * Finish task #62850. 2022-08-04 01:53:21 +00:00
zhouxudong ace4fde7a8 * Finish task #62850. 2022-08-04 01:48:56 +00:00
zhouxudong 461e3275db * Finish task #62850. 2022-08-04 01:32:48 +00:00
zhouxudong 9f26275965 * Finish task #62850. 2022-08-04 01:27:07 +00:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
zhouxudong 545f58f944 * Finish task #62850. 2022-08-03 09:25:08 +00:00
wangyuting2 afba28db68 * Add project execution approval menu. 2022-08-03 16:48:10 +08:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
wangyuting2 fa81472771 * Adjust menu. 2022-08-03 13:32:41 +08:00
zhouxudong 18504478db * Finish task #62850. 2022-08-02 09:39:55 +00:00
zhouxudong 73ec96dc8f * Finish task #62850. 2022-08-02 09:32:21 +00:00
zhouxudong 6a784fdfda * Finish task #62850. 2022-08-02 08:50:16 +00:00
zenggang 8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
zhouxudong 364a5009f4 * Finish task #62850. 2022-08-02 07:21:03 +00:00
wangyuting2 dc14d91320 * Finish task #63286. 2022-08-02 14:54:20 +08:00
王怡栋 1c2cc0a5c1 Merge branch 'sprint/220_liumengyi_25814' into 'master'
* Fix bug for change tab.

See merge request easycorp/zentaopms!4709
2022-07-28 06:32:13 +00:00
liumengyi a7568986c1 * Fix bug for change tab. 2022-07-28 14:21:28 +08:00
王怡栋 5ec5c071f3 Merge branch 'sprint/220_tianshujie_fixbug' into 'master'
Sprint/220 tianshujie fixbug

See merge request easycorp/zentaopms!4707
2022-07-28 05:47:21 +00:00
王怡栋 6376fb58e0 Merge branch 'sprint/master_zhouxudong_25748' into 'master'
* Fix bug #25748.

See merge request easycorp/zentaopms!4698
2022-07-28 02:05:44 +00:00
王怡栋 d6ea8aea86 Merge branch 'master_xieqiyu_25004' into 'master'
* Fix bug#25004.

See merge request easycorp/zentaopms!4676
2022-07-28 00:52:40 +00:00
zhouxudong 2e6ef972b0 * Fix bug #25748. 2022-07-28 00:47:37 +00:00
tianshujie 9f3c5e3b30 * Fix bug #25682. 2022-07-28 08:24:34 +08:00
xieqiyu cd8247954c * Fix bug#25004. 2022-07-27 13:31:48 +08:00
tianshujie 21be27748f * Fix bug #25745. 2022-07-27 13:12:37 +08:00
tianshujie 807c168fa9 * Finish task #61967. 2022-07-26 10:38:11 +08:00
tianshujie 21f33a3ee9 * Finish task #61967. 2022-07-25 15:35:47 +08:00
tianshujie 96c71eb326 * Finish task #61967. 2022-07-25 13:36:14 +08:00
tianshujie 4b59c7025a * Fix page error problem. 2022-07-21 17:34:07 +08:00
王怡栋 d349931e82 Merge branch 'sprint/217_liumengyi_61171' into 'master'
* Finish task #61171, #61170.

See merge request easycorp/zentaopms!4610
2022-07-20 06:23:40 +00:00
tianshujie 72ac19d156 * Finish task #61177. 2022-07-20 09:42:37 +08:00
liumengyi d73346c395 * Finish task #61171, #61170. 2022-07-19 15:22:38 +08:00
tianshujie 7eed8e4a2b * Finish task #61180. 2022-07-19 13:52:40 +08:00
mayue e31f207b0b * Fix bug #25358. 2022-07-15 10:45:23 +08:00
tianshujie 8f14e95044 * Fix bug #25268. 2022-07-14 13:07:52 +08:00
孙广明 52c9717727 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4531
2022-07-14 02:06:13 +00:00
tianshujie b5a9fe8c52 * Fix bug #25234,25233. 2022-07-14 09:57:56 +08:00
zhouxudong ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
王怡栋 70bd6eaa5e Merge branch 'sprint/master_zhouxudong_25163' into 'master'
* Fix bug #25163 #25166 #25170.

See merge request easycorp/zentaopms!4513
2022-07-13 05:53:10 +00:00
zhouxudong 729a4872ca * Fix bug #25163 #25166 #25170. 2022-07-13 05:47:57 +00:00
sunjun cf11a3a4fe fixConflict_24687 2022-07-13 05:31:43 +00:00
王怡栋 a769590829 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4502
2022-07-13 03:29:11 +00:00
tianshujie c52fc59335 * Fix bug #25072. 2022-07-13 11:26:59 +08:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明 5264032497 * Finish executio task tree. 2022-07-13 08:48:00 +08:00
孙广明 bd9700212c * Finish task #59706. 2022-07-12 22:48:07 +08:00
孙广明 2557d4ba30 * Code for execution list. 2022-07-12 17:30:14 +08:00
孙广明 8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +08:00
孙广明 c56ec2cbe4 * Add stage name. 2022-07-12 14:08:35 +08:00