Commit Graph
1902 Commits
Author SHA1 Message Date
孙广明 d4f5170391 Merge branch 'zenops_46_zhaoke_74993' into 'zenops_46'
Zenops 46 zhaoke 74993

See merge request easycorp/zentaopms!6395
2022-11-28 06:58:42 +00:00
caoyanyi 4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +08:00
孙广明 e60b156ea4 Merge branch 'master_zenops_wangjianhua' into 'master'
Modify Repo logic of shadow product.

See merge request easycorp/zentaopms!6317
2022-11-23 05:18:28 +00:00
zhaoke c2b0f0a656 * Update zanode name 2022-11-23 02:44:27 +00:00
Yagami 2f98f46365 * Finish task #77275. 2022-11-23 09:25:48 +08:00
wangjianhua bedc9e9309 * Show shadow product in Repo module. 2022-11-22 22:13:54 +08:00
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
lanzongjun 85130bfb02 * Fix Task #77009 2022-11-22 10:20:59 +08:00
zhaoke 45e1c4dc20 * Add view zahost. 2022-11-18 01:43:33 +00:00
caoyanyi b40d86d219 Merge branch 'master' into zenops_46 2022-11-17 14:42:05 +08:00
lanzongjun 9c2bdb2081 * Fix task #76407 2022-11-17 14:04:37 +08:00
lanzongjun 75d9b5ceb9 * Fix bug execution menu 2022-11-16 17:01:58 +08:00
wangyuting 5771eac9c8 * Fix bug #29666. 2022-11-16 05:34:42 +00:00
caoyanyi e60b21e1b6 Merge branch 'master' into zenops_46 2022-11-16 13:00:45 +08:00
王怡栋 5a11d47992 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #75921

See merge request easycorp/zentaopms!6176
2022-11-16 02:04:10 +00:00
王怡栋 567cefa44e Merge branch 'zentaopms_258_bug#29712' into 'master'
* Fix bug #29712.

See merge request easycorp/zentaopms!6168
2022-11-16 01:56:20 +00:00
lanzongjun b18918ad22 * finish task #75921 2022-11-16 09:36:11 +08:00
lanzongjun 2f7e39685c * finish task #75921 2022-11-16 09:34:31 +08:00
wangyuting 8270dc9ab2 * Fix bug #29712. 2022-11-15 09:57:19 +00:00
孙广明 093069f5eb Merge branch 'master_xieqiyu_75910' into 'master'
* Fix bug#29440.

See merge request easycorp/zentaopms!6148
2022-11-15 08:13:37 +00:00
王怡栋 f950d1fa82 * fix bug #76334. 2022-11-15 15:03:32 +08:00
lanzongjun 4849895b69 * finish task #76334 2022-11-15 14:18:36 +08:00
xieqiyu f86b9b0b17 * Fix bug#29440. 2022-11-15 09:51:31 +08:00
wangyuting e3ad1649a8 * Fix bug #29565. 2022-11-14 09:02:27 +00:00
caoyanyi f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
wangyuting 59fe4826ca * Finish task #75237. 2022-11-10 07:36:35 +00:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi 90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
wangyuting2 0cefde5d28 * Optimize code for review code. 2022-11-04 06:35:21 +00:00
liumengyi 90d07d8261 * Fix bug #29249, and modify 'BI' to 'Statistics'. 2022-11-04 09:54:38 +08:00
liyuchun 4f7af1f601 * Finish task #74675. 2022-11-03 15:03:08 +08:00
王怡栋 83eef8d509 Merge branch 'zentaopms_239_bug#29110' into 'zentaopms_239'
* Fix bug #29110.

See merge request easycorp/zentaopms!6004
2022-11-03 05:26:33 +00:00
wangyuting2 5448eaf3c7 * Fix bug #29110. 2022-11-03 01:08:39 +00:00
王怡栋 0219d85484 Merge branch 'zentaopms_239_bug_#29108' into 'zentaopms_239'
* Fix bug #29108.

See merge request easycorp/zentaopms!5990
2022-11-02 07:52:08 +00:00
daitingting f82d405eff * Fix bug #29108. 2022-11-02 07:28:28 +00:00
liyuchun e32a018700 * Finish task #74676. 2022-11-02 15:21:00 +08:00
wangyuting2 4d63abcce5 * Fix caselib bug. 2022-11-02 07:18:06 +00:00
liyuchun 315dacdc1d * Finish task #74675. 2022-11-02 14:36:18 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyuting2 dc4716f951 * Finish task #73845 ~ #73848. 2022-11-02 06:05:18 +00:00
王怡栋 2c02e877ac Merge branch 'zentaopms_239_task#73838' into 'zentaopms_239'
* Finish task #73838 ~ #73844.

See merge request easycorp/zentaopms!5977
2022-11-02 02:25:51 +00:00
wangyuting2 d54ca95ff6 * Finish task #73838 ~ #73844. 2022-11-02 01:15:40 +00:00
wangyidong 9cd542f3c7 * code for task #73987. 2022-11-01 12:10:37 +08:00
daitingting 47db9c31e3 * Finish task #74179. 2022-10-31 05:19:20 +00:00
wangyidong 7dee092c08 * code for task #74177. 2022-10-31 13:08:57 +08:00
wangyuting2 b48e275bcd * Optimize code. 2022-10-28 05:13:54 +00:00
wangyuting2 f61479fe2d * Finish task #73819. 2022-10-27 07:39:29 +00:00
wangyuting2 a1df161747 * Finish task #73818. 2022-10-27 06:45:09 +00:00
wangyuting2 5467991e67 * Finish task #73814. 2022-10-27 06:10:54 +00:00