Commit Graph
18660 Commits
Author SHA1 Message Date
holan20180123 05dda5ebb8 * Code for task #36041. 2021-02-22 14:35:53 +08:00
Yagami 36d49f1cdf * Code for task #36041. 2021-02-22 14:09:51 +08:00
tianshujie98 d4d819073a * Finish task #36019. 2021-02-22 14:07:16 +08:00
hufangzhou 183ee6bbc8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-22 14:03:20 +08:00
hufangzhou 3ade008ce6 * Finish task#36071. 2021-02-22 13:59:12 +08:00
tianshujie98 8ca0f10d06 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-22 13:43:50 +08:00
tianshujie98 76486af6cc * Fix bug. 2021-02-22 13:43:42 +08:00
wangyidong 6787d19ac7 * finish task #36010. 2021-02-22 13:04:18 +08:00
Yagami b668ce1970 * Finish task #36028,#36068,#36072. 2021-02-22 11:05:30 +08:00
wangyidong 98cea3e643 * finish task #35998. 2021-02-22 10:55:54 +08:00
tianshujie98 a86e104e2a * Fix bug. 2021-02-22 10:42:24 +08:00
wangyidong 670929c152 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-22 10:38:30 +08:00
tianshujie98 f58b318ccd * Fix bug. 2021-02-22 10:02:59 +08:00
tianshujie98 56e42a7fb0 * Fix bug. 2021-02-22 09:40:35 +08:00
qiyu-xie 48075c526d * When merge data by product, add an arrow in the page. 2021-02-22 09:27:26 +08:00
qiyu-xie ff8bb44ada * Fix bug. 2021-02-22 09:04:00 +08:00
wangyidong e6047b01cc * finish task #36023. 2021-02-21 17:54:52 +08:00
wangyidong 2a29dc0c7f * finish task #35997. 2021-02-21 16:46:34 +08:00
tianshujie98 b0384bbc7f * Batch editing project interface. 2021-02-20 17:41:13 +08:00
qiyu-xie 83c4669281 * Finish task#36086. 2021-02-20 17:00:25 +08:00
Yagami 4027c87f5b * Finish task #36015. 2021-02-20 16:28:45 +08:00
tianshujie98 0d07351cf3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-20 16:02:10 +08:00
tianshujie98 1b173f6f0d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-20 16:02:03 +08:00
Yagami d1f2c3cabd * Finish task #36070/#36069. 2021-02-20 16:00:16 +08:00
tianshujie98 8212de6cc3 * Modify the logic of project editing. 2021-02-20 15:57:10 +08:00
wangyidong 734611b324 * finish task #36017. 2021-02-20 15:56:04 +08:00
wangyidong ddb7175ea5 * finish task #36026. 2021-02-20 14:55:11 +08:00
wangyidong 7425414bb8 * adjust for error. 2021-02-20 14:42:54 +08:00
leiyong c710a65808 * Finish task#36058. 2021-02-20 14:41:50 +08:00
wangyidong e4486ae6eb * adjust for captcha. 2021-02-20 14:37:26 +08:00
leiyong 3e980f2e6f * Finish task#36034. 2021-02-20 14:30:40 +08:00
leiyong cc1591fecc * Finish task#36020. 2021-02-20 14:30:19 +08:00
Yagami 75136c6365 * Remove unused code. 2021-02-20 14:12:29 +08:00
leiyong 878553e9aa Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-20 13:57:35 +08:00
leiyong d89df79257 * Finish task#36061. 2021-02-20 13:57:27 +08:00
Yagami 70a909c508 * Add program update order priv. 2021-02-20 13:56:24 +08:00
Yagami 7a50a4512c * Upgrade programs add order. 2021-02-20 13:42:18 +08:00
hufangzhou ef05506d95 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-20 13:36:07 +08:00
hufangzhou fce763fa42 * Finish task #36048. 2021-02-20 13:36:02 +08:00
qiyu-xie eba69aa8b7 * Finish task#36030.36047. 2021-02-20 13:26:51 +08:00
holan20180123 8d9a5c2830 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-20 13:22:57 +08:00
holan20180123 0721d6900c * Finish task #36014. 2021-02-20 13:22:33 +08:00
leiyong 3d67f9fc94 * Finish task#36040. 2021-02-20 11:27:52 +08:00
holan20180123 25e82dec6a Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-20 11:20:09 +08:00
holan20180123 9d4900b30e * Finish task #36014. 2021-02-20 11:19:22 +08:00
hufangzhou 53655c7c16 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-20 11:17:27 +08:00
hufangzhou c08df84c0c * Finish task #36003. 2021-02-20 11:17:25 +08:00
Yagami 6e16b35205 * Fix story concept. 2021-02-20 11:13:27 +08:00
hufangzhou 62e481747d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-20 11:11:57 +08:00
hufangzhou 81f261dd64 * Finish task #36088. 2021-02-20 11:11:43 +08:00