Commit Graph
587 Commits
Author SHA1 Message Date
wangyidong 6c02c05d51 * fix bug #30676. 2022-12-15 09:18:46 +08:00
Yagami a299a62db1 * Rename siblings to twins. 2022-12-12 14:13:06 +08:00
wangyidong 7c8f4674cf * code for task #78909. 2022-12-06 10:37:24 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
Yagami f881d7951e * Fix bug #30017. 2022-11-24 13:46:14 +08:00
wangyidong 126d55f807 * code task #74929. 2022-11-10 15:19:57 +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
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
xieqiyu 0a9a801389 * Code for task#74152. 2022-11-01 07:48:34 +00: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
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
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
王怡栋 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
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
王怡栋 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
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
lanzongjun 0afb47e9df * fix task #66994 2022-08-30 16:12:02 +08:00
liumengyi 3805d90035 * Fix bug for action. 2022-08-26 09:17:07 +08:00
liumengyi e7bbfe300c * Fix bug #26839. 2022-08-24 16:26:06 +08:00
xieqiyu 40771942f7 Merge remote-tracking branch 'origin' into master_xieqiyu_draftStory 2022-08-22 17:47:50 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
liumengyi 66532261dd * Fix bug for no execution view. 2022-08-22 15:54:42 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
王怡栋 0c1750f575 Merge branch 'sprint/hufangzhou_action' into 'master'
* Add the ignored object type config for plugin.

See merge request easycorp/zentaopms!5028
2022-08-19 05:12:45 +00:00
曾刚 caed6b27cd Fix bug#26664 2022-08-19 05:10:19 +00:00