Commit Graph
596 Commits
Author SHA1 Message Date
caoyanyi fc95313a40 Merge branch 'master' into zenops_46 2022-11-28 08:41:37 +08:00
Yagami f881d7951e * Fix bug #30017. 2022-11-24 13:46:14 +08:00
caoyanyi 5145b98f24 * Modify actions get. 2022-11-14 16:24:49 +08:00
caoyanyi f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
wangyidong 126d55f807 * code task #74929. 2022-11-10 15:19:57 +08:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong bd18396178 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-08 08:41:50 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie c05b94e3b0 * Fix bug #29377. 2022-11-07 16:00:47 +08:00
caoyanyi 90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyidong f2cd7c12b4 * code for task #74779. 2022-11-02 14:21:24 +08:00
wangyidong 4a0a5649a0 * adjust code. 2022-11-02 09:16:51 +08:00
wangyidong 40e20fa112 * code for task #74178. 2022-11-01 10:22:13 +08:00
tianshujie 0c2fd62c0a 8 Fix bug #29021. 2022-10-28 09:30:51 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
liyuchun 11a4983080 Merge branch 'master' into zenops_46 2022-10-25 11:28:43 +08:00
lanzongjun e1330d9de1 * fix bug 2022-10-20 14:48:30 +08:00
wangyidong 6c5ae13ce7 * fix bug #72263. 2022-10-18 13:45:12 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
liugang e19ff62117 * Fix bug #28278. 2022-10-09 17:16:37 +08:00
wangyidong 8f6fd3919a * code for task #71605. 2022-10-09 11:16:58 +08:00
曹延义 0afdc68654 Merge branch 'master' into zenops_46 2022-09-30 15:07:37 +08:00
tanghucheng f6bb08d1e2 * Task#70756 Reduction shadow product. 2022-09-30 10:18:25 +08:00
xieqiyu c303642c42 * Code for bug#26993. 2022-09-30 01:28:21 +00:00
xieqiyu 9b7dd7f98e * Fix bug#26993. 2022-09-30 01:26:18 +00:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
liyuchun 6bed7509e7 Merge branch 'master' into zenops_46 2022-09-29 09:25:12 +08:00
王怡栋 14012809bd Merge branch 'sprint/fixbug_liumengyi_26595' into 'master'
* Optimize code for bug #26595.

See merge request easycorp/zentaopms!5559
2022-09-27 05:36:13 +00:00
liumengyi cd63217eef * Fix bug #28010. 2022-09-27 11:12:29 +08:00
liumengyi 41dff1f5ff * Optimize code for bug #26595. 2022-09-27 10:27:21 +08:00
liumengyi b19ca2dc9c * Fix bug #26595. 2022-09-27 09:28:16 +08:00
wangyuting2 951d1c2d1f * Fix bug #27807. 2022-09-26 08:11:04 +00:00
liugang c757777eef * Hide the actions of a shadow product. 2022-09-23 16:23:10 +08:00
曹延义 d5fa809755 Merge branch 'master' into zenops_44 2022-09-09 10:59:26 +08:00
xieqiyu 924f288ed5 * Fix bug#27406,#27235. 2022-09-08 16:55:57 +08:00
xieqiyu 5f427364c7 * Fix bug#27346. 2022-09-08 13:47:57 +08:00
曹延义 2014a4b0ba Merge branch 'master' into zenops_44 2022-09-07 06:51:46 +00:00
王怡栋 a1e31e99e3 Merge branch 'master_xieqiyu_66957' into 'master'
* Code for task#68109.

See merge request easycorp/zentaopms!5266
2022-09-06 02:57:03 +00:00
xieqiyu 8db8c3974b * Code for task#68109. 2022-09-06 08:55:35 +08:00
lanzongjun c4ed80d958 * fix bug #27198 2022-09-05 10:59:46 +08:00
liyuchun 5f04a8d798 Merge branch 'master' into zenops_44 2022-09-05 09:29:53 +08:00
mayue 66eec9f4db * Finish task #66987. 2022-09-01 13:39:16 +08:00
lanzongjun 9a3fd86d66 fix code 2022-09-01 13:20:11 +08:00
lanzongjun 4767bcd66f add dy reviewissue 2022-09-01 10:31:49 +08:00
lanzongjun 71cd04f05d modify processed 2022-09-01 09:37:59 +08:00
liyuchun d9642d657f * Finish task #65984. 2022-08-30 16:58:48 +08:00
lanzongjun 0afb47e9df * fix task #66994 2022-08-30 16:12:02 +08:00
liyuchun 007aec70c8 * Fix error when update commit. 2022-08-29 16:43:17 +08:00