Commit Graph
1411 Commits
Author SHA1 Message Date
wangyuting2 0cefde5d28 * Optimize code for review code. 2022-11-04 06:35:21 +00:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyuting2 b7ebe4ee2b * Optimize code. 2022-10-28 08:05:21 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tianshujie 49da824085 * Remove useless code. 2022-10-27 08:17:42 +08:00
tianshujie f54ab6edc4 * Finish task #73749. 2022-10-26 15:41:44 +08:00
tianshujie 99e6e88e76 * Finish task #73748. 2022-10-26 15:40:59 +08:00
tianshujie 324245db52 * Finish task #73748. 2022-10-26 15:38:03 +08:00
tianshujie dbb7a17464 * Finish task #73746. 2022-10-26 15:30:11 +08:00
tianshujie f1fb4cf2f9 Merge branch 'sprint/253_tianshujie_dashboard' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/253_tianshujie_dashboard 2022-10-26 14:58:44 +08:00
tianshujie 58e4192fe2 * Finish task #73746. 2022-10-26 14:58:27 +08:00
caoyanyi 7b545e9a25 * Code for task #73763. 2022-10-26 14:35:36 +08:00
tianshujie 03276390b2 * Finish task #73749. 2022-10-26 14:09:18 +08:00
tianshujie b7a0d76922 * Finish task #73749. 2022-10-26 14:06:52 +08:00
tianshujie d7af949b90 * Finish task #73732. 2022-10-26 14:05:08 +08:00
tianshujie 935faa00bd * Finish task #73752. 2022-10-26 14:01:04 +08:00
wangyidong ed271d5360 * fix bug #28961. 2022-10-26 13:56:38 +08:00
tianshujie 9d5c06cc6d * Finish task #73748. 2022-10-26 13:30:28 +08:00
tianshujie cea28c452c * Finish task #73749. 2022-10-26 13:25:40 +08:00
tianshujie 308a8b9f5e * Finish task #73750. 2022-10-26 13:15:38 +08:00
tianshujie 1dfce702bd * Finish task #73752. 2022-10-26 11:31:28 +08:00
tianshujie 826eb771b9 * Finish task #73732. 2022-10-26 11:04:29 +08:00
tianshujie 012e867e40 * Finish task #73731. 2022-10-26 10:52:42 +08:00
tianshujie 38e08733f9 * Finish task #73733. 2022-10-26 09:58:46 +08:00
tianshujie 970f06cf05 * Finish task #73734. 2022-10-26 09:55:51 +08:00
wangyidong 6854d16d4e * code for task #71672. 2022-10-24 14:44:20 +08:00
hufangzhou d3f7df5518 * Add the new version. 2022-10-19 05:41:40 +00:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
tianshujie 4245745bec * Finish task #72351. 2022-10-17 16:31:40 +08:00
Lufei 261c3a0217 * Fix GH-92: Uncaught TypeError: Unsupported operand types: array + null. 2022-10-13 10:36:39 +08:00
曹延义 5a91f0130a * Adjust code. 2022-10-11 16:42:42 +08:00
曹延义 d4b88eaf41 * Adjust code. 2022-10-11 16:41:10 +08:00
曹延义 7cd098a613 * Fix bug #28453. 2022-10-11 16:15:33 +08:00
zhouxin c25d5827dc * Fix bugs. 2022-10-11 11:32:45 +08:00
王怡栋 b7ae9696e3 Merge branch 'zentaopms_239_task#71588' into 'zentaopms_239'
* Finish task #71588,#71589,#71590,#71591.

See merge request easycorp/zentaopms!5714
2022-10-10 09:24:04 +00:00
daitingting 1e7ad8f0f2 * Finish task #71588,#71589,#71590,#71591. 2022-10-10 08:22:50 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
zhouxin 0cfb69ac5b * Finish task #71836. 2022-10-10 15:23:22 +08:00
wangyidong 07a41aa312 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_239 2022-10-09 14:30:59 +08:00
wangyidong 50c365d5b0 * code for task #71604. 2022-10-09 14:26:59 +08:00
王怡栋 2d6460f443 Merge branch 'zentaopms_239_task#71654' into 'zentaopms_239'
* Finish task #71654.

See merge request easycorp/zentaopms!5679
2022-10-09 05:12:30 +00:00
wangyuting2 40634e6d14 * Finish task #71654. 2022-10-09 03:04:41 +00:00
wangyidong cd92d5bc1b * code for task #71604. 2022-10-09 10:45:23 +08:00
wangyidong 96f993d108 * code for task #71603. 2022-10-09 10:04:38 +08:00
wangyidong bd2f3df6af * code for task #71602. 2022-10-09 09:24:04 +08:00
wangyidong 13cf3070a1 * code for task #71601. 2022-10-09 09:16:07 +08:00
wangyidong e3658d178f * code for task #71601. 2022-10-09 09:04:06 +08:00
wangyidong 91b8e84e13 * code for task #71601. 2022-10-09 08:35:06 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
daitingting 4eb2fcc4c7 * Remove useless codes.
* Add note for param.
2022-09-28 09:08:14 +00:00