Commit Graph
1266 Commits
Author SHA1 Message Date
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
zhouxudong 9f26275965 * Finish task #62850. 2022-08-04 01:27:07 +00:00
wangyidong d4c95e6e9c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 09:14:41 +08:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
王怡栋 b6869b0602 Merge branch 'sgm_block' into 'master'
Sgm block

See merge request easycorp/zentaopms!4772
2022-08-04 01:01:35 +00:00
sunguangming 9d1ce4c9d5 * Code for project export program name. 2022-08-04 08:39:15 +08:00
liuruogu 653f238cac * Finish task #63386. 2022-08-03 09:05:13 +00:00
李玉春 e8e657e6bb Update model.php 2022-08-03 06:52:05 +00:00
tianshujie b4a394718f * Finish task #62947. 2022-08-03 14:49:42 +08:00
tianshujie 167c36d6d5 * Finish task #62947. 2022-08-03 13:41:05 +08: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
zhouxudong 626ab2ccee * Finish task #62836 ~ #62849. 2022-08-02 02:41:23 +00:00
zhouxudong 2358f42e39 * Finish task #62836 ~ #62849. 2022-08-01 08:13:05 +00:00
zenggang dfae2ec61f * Fix bug#23205 2022-07-28 06:55:51 +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
xieqiyu 0ec68feb10 * Fix bug#25004. 2022-07-27 21:38:28 +08:00
xieqiyu 91493be372 * Fix bug#25523. 2022-07-27 14:11:10 +08:00
xieqiyu cd8247954c * Fix bug#25004. 2022-07-27 13:31:48 +08:00
tianshujie 6454cc7025 * Resolve issue #697. 2022-07-27 11:15:27 +08:00
tianshujie cac6216a09 * Finish task #61967. 2022-07-26 10:50:16 +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
孙广明 815c633bc7 * Code for my-index speed. 2022-07-22 10:26:59 +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
王怡栋 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
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
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 67772332b5 * Fix bug #24929. 2022-07-15 14:16:27 +08:00
mayue b4dff9c119 * Fix bug #24930. 2022-07-14 10:33:56 +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
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
孙广明 4caa38c31e * Code for execution list. 2022-07-12 14:00:25 +08:00
孙广明 daf3ef4c99 * Code for execution list. 2022-07-12 00:43:56 +08:00
孙广明 1afa07c083 * Code for task list. 2022-07-08 13:37:28 +08:00
孙广明 613c00bed9 * Code for stage/task. 2022-07-06 13:31:14 +08:00
sunjun e5ed8133b1 sprint_59473 2022-07-06 01:06:35 +00:00
liyuchun 9771037534 * Fix bug #24312. 2022-07-01 00:42:44 +00:00
liumengyi 3d92afa1ae * Fix bug. 2022-06-30 11:20:41 +08:00
王怡栋 e00896f727 Merge branch 'sprint/master_zhouxudong_24417' into 'master'
Sprint/master zhouxudong 24417

See merge request easycorp/zentaopms!4237
2022-06-30 01:28:55 +00:00