Commit Graph
18600 Commits
Author SHA1 Message Date
holan20180123 f093824f69 * Finish task #36025. 2021-02-19 16:42:32 +08:00
holan20180123 bc54d81bc7 * Finish task #36024. 2021-02-19 15:50:55 +08:00
holan20180123 6bfcb89c36 * Finish task #36000. 2021-02-19 15:39:04 +08:00
qiyu-xie b4d52edf2e * Finish task#36064. 2021-02-19 15:29:31 +08:00
qiyu-xie 58f48f13f8 * Finish task#36064. 2021-02-19 15:29:31 +08:00
qiyu-xie b6a4da380e * Finish task#36063. 2021-02-19 15:29:31 +08:00
qiyu-xie b85e38ffa2 * Finish task#36077. 2021-02-19 15:29:31 +08:00
holan20180123 80b1c44d4a Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-19 15:24:07 +08:00
holan20180123 1e7beb09af * Finish task #36018. 2021-02-19 15:23:32 +08:00
leiyong 8a7983c5a0 * Finish task#36031,task#36011,task#36012,task#36016. 2021-02-19 13:31:18 +08:00
wangyidong 6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
tianshujie98 3ee2aa34a7 * Finish task #35999. 2021-02-19 11:13:08 +08:00
tianshujie98 cd7a74ccbc * Finish task #36055, 36054, 36053. 2021-02-19 11:08:40 +08:00
tianshujie98 c289d0092c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-19 10:28:21 +08:00
tianshujie98 4045f13491 * Finish task #36067. 2021-02-19 10:26:51 +08:00
holan20180123 e624596b49 * Finish task #36014. 2021-02-19 10:23:44 +08:00
wangyidong d3669d6ee5 * adjust for feishu webhook. 2021-02-19 10:19:48 +08:00
wangyidong a1c238496d * finish task #9083,9108,9109. 2021-02-19 10:19:48 +08:00
wangyidong dc7cf604e9 * fix bug #3746. 2021-02-19 10:19:46 +08:00
qiyu-xie c3bc4c3cdf * Modify job view lable. 2021-02-19 10:19:44 +08:00
wangyidong 0dd31db0f0 * fix for get extension license order file. 2021-02-19 10:19:43 +08:00
tianshujie98 7fb71d6f9e * Finish task #8683. 2021-02-19 10:19:26 +08:00
leiyong 912c332299 * Fix bug. 2021-02-19 10:19:26 +08:00
qiyu-xie ba205e23af * Finish task#36081. 2021-02-19 09:39:28 +08:00
hufangzhou 796d89c8e9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-19 09:37:30 +08:00
hufangzhou f821dad6d2 * Finish task #36002. 2021-02-19 09:11:36 +08:00
Yagami 2d3e8e42b3 * Remove product change program condition. 2021-02-19 09:10:29 +08:00
leiyong 40f64463b1 * Fix bug. 2021-02-18 14:03:05 +08:00
hufangzhou def14e0080 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-18 13:37:47 +08:00
hufangzhou 1205201de1 * Fix bug #10977. 2021-02-18 13:37:44 +08:00
leiyong eddeec47cf * Fix bug. 2021-02-18 13:22:22 +08:00
hufangzhou 154276a3f6 * Adjust the style. 2021-02-18 09:59:44 +08:00
hufangzhou bf3874c53e * Adjust the submit button style. 2021-02-18 09:30:16 +08:00
hufangzhou fa4c4c31c1 * Fix a bug. 2021-02-18 09:12:39 +08:00
holan20180123 94bacf0238 * Adjust the style. 2021-02-10 16:16:45 +08:00
hufangzhou fe39709e78 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-10 14:51:40 +08:00
hufangzhou 9b123a8c56 * Fix a bug. 2021-02-10 14:51:38 +08:00
sgm0422 0f43ebdd34 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-10 10:56:26 +08:00
sgm0422 aaabaabf4e * Fix bug. 2021-02-10 10:56:20 +08:00
leiyong 6470a77a4e * Fix bug#10974. 2021-02-10 10:07:47 +08:00
holan20180123 c90fdfc528 * Remove duplicate code. 2021-02-09 14:36:52 +08:00
holan20180123 04d48a701d * Remove duplicate code. 2021-02-09 14:20:03 +08:00
hufangzhou e10844807b Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-09 09:29:55 +08:00
hufangzhou d013ea7a3f * Fix bug #10971. 2021-02-09 09:29:51 +08:00
holan20180123 440d8f440e * Delete duplicate code. 2021-02-08 17:09:11 +08:00
holan20180123 166f48a297 * Delete duplicate code. 2021-02-08 17:01:10 +08:00
holan20180123 67dd183b10 * Fix bug #10966. 2021-02-08 14:21:15 +08:00
hufangzhou 49148806ac * Adjust the date control style. 2021-02-08 14:05:13 +08:00
holan20180123 a76ae26523 * Fix bug #10966. 2021-02-08 10:53:11 +08:00
leiyong 4bc4aac3be * Fix bug. 2021-02-07 17:33:08 +08:00