Commit Graph
4248 Commits
Author SHA1 Message Date
孙广明 815c633bc7 * Code for my-index speed. 2022-07-22 10:26:59 +08:00
tianshujie 4b59c7025a * Fix page error problem. 2022-07-21 17:34:07 +08:00
王怡栋 dcd013186a Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4620
2022-07-21 05:08:47 +00:00
tianshujie 68da0b31d2 * Modify the return link for the delete project method. 2022-07-21 11:35:11 +08:00
孙广明 f4c75cd9af * Code for my-block. 2022-07-21 11:28:40 +08:00
tianshujie 1f00ba8c03 * Modify the return link for the delete project method. 2022-07-21 09:51:50 +08:00
王怡栋 08bc30c893 Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4616
2022-07-20 09:29:29 +00:00
王怡栋 c0d3c1da7f Merge branch 'sprint/217_zg_61182' into 'master'
* Finish task#61182,61168

See merge request easycorp/zentaopms!4615
2022-07-20 09:29:07 +00:00
tianshujie e547bc05a8 * A project cannot be saved successfully for a long time during batch editing. 2022-07-20 17:02:14 +08:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
王怡栋 1bff7088d1 Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4612
2022-07-20 08:08:56 +00:00
tianshujie 68eecb775e * Fix bug #25483. 2022-07-20 16:07:50 +08:00
tianshujie c4ab5588af * Fix bug #25483. 2022-07-20 15:59:50 +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 d225cab26b * Remove spaces. 2022-07-20 09:45:12 +08:00
tianshujie 72ac19d156 * Finish task #61177. 2022-07-20 09:42:37 +08:00
tianshujie f0dec448ce * Finish task #61177. 2022-07-20 08:36:04 +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
王怡栋 393a7466a1 Merge branch 'master_xieqiyu_25038' into 'master'
* Fix bug#25038.

See merge request easycorp/zentaopms!4580
2022-07-15 07:10:20 +00:00
xieqiyu ea5c5c760d * Delete future width when create project. 2022-07-15 14:38:17 +08:00
liumengyi 67772332b5 * Fix bug #24929. 2022-07-15 14:16:27 +08:00
孙广明 aedab5c784 Merge branch 'sprint/216_mayue_bug#25358' into 'master'
* Fix bug #25358.

See merge request easycorp/zentaopms!4571
2022-07-15 03:14:57 +00:00
mayue e31f207b0b * Fix bug #25358. 2022-07-15 10:45:23 +08:00
孙广明 d5c7586a47 * Fix menu bug. 2022-07-15 10:33:58 +08:00
孙广明 6b19ed146d Merge branch 'sprint/tianshujie_25268' into 'master'
Sprint/tianshujie 25268

See merge request easycorp/zentaopms!4547
2022-07-14 07:24:17 +00:00
孙广明 083ebb7f29 * Fix stage-task tree list bug. 2022-07-14 13:29:23 +08:00
tianshujie 8f14e95044 * Fix bug #25268. 2022-07-14 13:07:52 +08:00
mayue b4dff9c119 * Fix bug #24930. 2022-07-14 10:33:56 +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
tianshujie ace5265a11 * Fix bug #25206. 2022-07-14 09:36:42 +08:00
zhouxudong ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
孙广明 b9a6b4a2cc * Code for execution list order. 2022-07-13 14:45:04 +08: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
孙广明 3e03fa9082 Merge branch 'sprint/216_mayue_bug#24930' into 'master'
* Fix bug #24930.

See merge request easycorp/zentaopms!4494
2022-07-13 02:16:46 +00:00
mayue e3abe64edc * Fix bug #24930. 2022-07-13 10:03:51 +08:00
孙广明 f506169428 * Only query active task in execution list. 2022-07-13 08:54:39 +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
王怡栋 53a977af20 Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Finish task #60491.

See merge request easycorp/zentaopms!4475
2022-07-12 07:45:36 +00:00
liumengyi b4ab8b5b39 * Finish task #60491. 2022-07-12 15:31:11 +08:00
liumengyi ba36ed56b5 * Fix bug #60491. 2022-07-12 14:42:55 +08:00