Commit Graph
37424 Commits
Author SHA1 Message Date
王怡栋 c273c3aefe Merge branch 'sprint/master_zhouxudong_21700' into 'master'
* Fix bug #21700.

See merge request easycorp/zentaopms!2904
2022-04-13 07:19:18 +00:00
王怡栋 ac0f89247c Merge branch 'sprint/tianshujie_bug17551' into 'master'
Sprint/tianshujie bug17551

See merge request easycorp/zentaopms!2916
2022-04-13 07:02:40 +00:00
tianshujie d41521bbcc * Fix bug #21699. 2022-04-13 14:53:33 +08:00
王怡栋 6e9c3a8afc Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *21293

See merge request easycorp/zentaopms!2915
2022-04-13 06:49:48 +00:00
Zongjun Lan e13c17216a * modify sql 2022-04-13 14:48:05 +08:00
tianshujie b9670165ab * Fix bug #21653. 2022-04-13 14:44:01 +08:00
Zongjun Lan 0aa1cc9ad9 * fix bug *21293 2022-04-13 14:39:33 +08:00
tianshujie f612dcd079 * Fix bug 17551. 2022-04-13 14:27:53 +08:00
tianshujie e681135a3a * Fix bug #21643. 2022-04-13 14:22:32 +08:00
王怡栋 940659bc12 Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21576.

See merge request easycorp/zentaopms!2913
2022-04-13 05:57:24 +00:00
王怡栋 fd4e6bc2bc Merge branch 'sprint/fixbug_hufangzhou_15656' into 'master'
* Fix bug #15656.

See merge request easycorp/zentaopms!2907
2022-04-13 05:39:42 +00:00
王怡栋 1c52566984 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *20169

See merge request easycorp/zentaopms!2905
2022-04-13 05:37:49 +00:00
王怡栋 3c0b0a6c31 Merge branch 'sprint/tianshujie_bug17551' into 'master'
* Fix bug #17551.

See merge request easycorp/zentaopms!2912
2022-04-13 05:37:09 +00:00
tianshujie 90a1fea2d8 * Fix bug #17551. 2022-04-13 13:35:02 +08:00
李玉春 ebab24c97b Merge branch 'sprint/master_zhouxudong_14891' into 'master'
* Fix bug #14891.

See merge request easycorp/zentaopms!2908
2022-04-13 03:29:06 +00:00
zhouxudong 20a9051148 * Fix bug #14891. 2022-04-13 11:23:29 +08:00
hufangzhou 18293e3e0d * Fix bug #15656. 2022-04-13 11:19:20 +08:00
tanghucheng 0c2c898c01 * Fix bug #21576. 2022-04-13 10:46:44 +08:00
Zongjun Lan 486295dcc1 * fix bug *20169 2022-04-13 10:28:29 +08:00
朱金勇 a534c56793 Merge branch 'autotest_ly' into 'master'
Autotest ly

See merge request easycorp/zentaopms!2901
2022-04-13 02:11:33 +00:00
朱金勇 d2dcdd6a91 Merge branch 'zry_app' into 'master'
* Fix api for bug to story.

See merge request easycorp/zentaopms!2900
2022-04-13 02:11:16 +00:00
zhouxudong 7ac526401d * Fix bug #21700. 2022-04-13 10:08:53 +08:00
孙广明 64df7ac5c0 Merge branch 'sunhuawei_fixbug_21668' into 'master'
*Fix bug#21668

See merge request easycorp/zentaopms!2903
2022-04-13 02:07:02 +00:00
王怡栋 f6b236aed7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-13 10:02:05 +08:00
王怡栋 a9809c35aa * code for bug #20823. 2022-04-13 10:01:36 +08:00
孙华伟 df57c95636 *Fix bug#21668 2022-04-13 09:59:37 +08:00
王怡栋 f9e8a8d69f Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21614.

See merge request easycorp/zentaopms!2896
2022-04-13 01:55:56 +00:00
王怡栋 9529d136a8 Merge branch 'sprint/tianshujie_bug17280' into 'master'
Sprint/tianshujie bug17280

See merge request easycorp/zentaopms!2902
2022-04-13 01:54:16 +00:00
tianshujie 2e5b43979e * Fix bug #21641. 2022-04-13 09:51:40 +08:00
liyang ad1c5c34e8 update module data 2022-04-13 09:47:30 +08:00
tianshujie 1ef7a9f6b0 * Fix bug #16607. 2022-04-13 09:45:05 +08:00
zhengrunyu 6676b9a7c2 * Fix api for bug to story. 2022-04-13 09:44:51 +08:00
孙广明 e172ea39b6 Merge branch 'fixbug_zhouxin_18307' into 'master'
* Fix bug #18307.

See merge request easycorp/zentaopms!2527
2022-04-13 01:34:42 +00:00
王怡栋 26db87c796 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of create test case.

See merge request easycorp/zentaopms!2898
2022-04-13 01:22:54 +00:00
tianshujie f6cf76e520 * Fix bug #19261. 2022-04-13 09:18:15 +08:00
tianshujie 04dc939bda Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug17280 2022-04-13 09:15:30 +08:00
xieqiyu 41b48ac200 * Fix bug of create test case. 2022-04-13 09:13:50 +08:00
liyang 92e13b052a add module data 2022-04-12 17:07:03 +08:00
李玉春 34451f5715 Merge branch 'devops26_52583' into 'master'
Fix bug#21649,21512,21002

See merge request easycorp/zentaopms!2882
2022-04-12 09:06:51 +00:00
tanghucheng 7e1a3564d1 * Fix bug #21614. 2022-04-12 17:02:48 +08:00
王怡栋 9a10781201 Merge branch 'sprint/tianshujie_bug21641' into 'master'
Sprint/tianshujie bug21641

See merge request easycorp/zentaopms!2887
2022-04-12 08:55:41 +00:00
王怡栋 a8a174a455 Merge branch 'sprint/fixbug_hufangzhou_17974' into 'master'
* Fix bug #17974 for objectlibs method.

See merge request easycorp/zentaopms!2889
2022-04-12 08:55:02 +00:00
王怡栋 827d74f46e Merge branch 'sprint/scx_doclang' into 'master'
* Move doc lang.

See merge request easycorp/zentaopms!2891
2022-04-12 08:46:07 +00:00
孙广明 e17188285c Merge branch 'master_xieqiyu_19625' into 'master'
* Fix bug#19625.

See merge request easycorp/zentaopms!2890
2022-04-12 08:33:15 +00:00
孙广明 6ef66fd6ef Merge branch 'master_xieqiyu_21385' into 'master'
* Fix bug#21385.

See merge request easycorp/zentaopms!2885
2022-04-12 08:32:47 +00:00
孙广明 ee9aaa85b8 Merge branch 'master_xieqiyu_13127' into 'master'
* Fix bug#13127.

See merge request easycorp/zentaopms!2884
2022-04-12 08:32:31 +00:00
孙广明 b309300da4 Merge branch 'mayue_fix_bug#18065' into 'master'
* Fix bug#18065.

See merge request easycorp/zentaopms!2886
2022-04-12 07:58:45 +00:00
孙广明 c55f5d8110 Merge branch 'sprint/unitTest_liumengyi_stage' into 'master'
* Add unit test of stage.

See merge request easycorp/zentaopms!2895
2022-04-12 07:56:32 +00:00
liumengyi bdb910be61 * Add unit test of stage. 2022-04-12 15:54:15 +08:00
孙广明 d82b552898 Merge branch 'fixbugs_zhouxin_21374' into 'master'
* Fix bug #21374.

See merge request easycorp/zentaopms!2893
2022-04-12 07:52:52 +00:00