Commit Graph
30688 Commits
Author SHA1 Message Date
tianshujie f7fd08aaa3 * Fix bug #20789. 2022-04-01 13:27:26 +08:00
王怡栋 e052b84ac4 Merge branch 'sprint/fixbug_hufangzhou_15961' into 'master'
Sprint/fixbug hufangzhou 15961

See merge request easycorp/zentaopms!2701
2022-04-01 03:30:53 +00:00
王怡栋 dec6eba5b2 Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21336,21296.

See merge request easycorp/zentaopms!2700
2022-04-01 03:29:18 +00:00
王怡栋 6952a16e84 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20256

See merge request easycorp/zentaopms!2692
2022-04-01 03:28:18 +00:00
hufangzhou c74f8f2b5a * Modify the checkbox style of api edit page. 2022-04-01 11:01:30 +08:00
tanghucheng b8aec834dd * Fix bug #21296,21336. 2022-04-01 10:56:35 +08:00
hufangzhou b2543e022f * Fix bug #15961. 2022-04-01 10:56:30 +08:00
孙广明 55040695e4 Merge branch 'sprint/tianshujie_upgrade' into 'master'
* Fixed the issue of missing project whitelist when upgrading to classic mode.

See merge request easycorp/zentaopms!2696
2022-04-01 02:54:32 +00:00
李玉春 ca26374c57 Merge branch 'sprint/master_zhouxudong_13765' into 'master'
Sprint/master zhouxudong 13765

See merge request easycorp/zentaopms!2699
2022-04-01 02:51:56 +00:00
孙广明 67e3a3b4c4 Merge branch 'sunhuawei_fixbug_15989' into 'master'
Sunhuawei fixbug 15989

See merge request easycorp/zentaopms!2681
2022-04-01 02:50:22 +00:00
李玉春 d5101149e9 Merge branch 'devops24_51065' into 'master'
Fix bug#11161

See merge request easycorp/zentaopms!2693
2022-04-01 02:49:15 +00:00
zhouxudong bd13abc6b4 * Fix bug #13765. 2022-04-01 10:47:35 +08:00
songchenxuan d424737aff * Fix change story bug . 2022-04-01 10:42:05 +08:00
tianshujie 54e5865653 * Fixed the issue of missing project whitelist when upgrading to classic mode. 2022-04-01 10:29:29 +08:00
孙广明 1d7982f458 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2694
2022-04-01 02:15:55 +00:00
tianshujie 37bfaafccc * Fixed the issue that the product whitelist was lost when upgrading to classic mode. 2022-04-01 10:13:37 +08:00
zenggang d63710351c * Fix bug#11161 2022-04-01 02:06:20 +00:00
Zongjun Lan bbea31bd09 * fix bug #20256 2022-04-01 10:01:48 +08:00
王怡栋 c618f0e616 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20310

See merge request easycorp/zentaopms!2689
2022-04-01 01:55:39 +00:00
王怡栋 f5c9b94b82 Merge branch 'sprint/xuanxuan_96' into 'master'
Sprint/xuanxuan 96

See merge request easycorp/zentaopms!2687
2022-04-01 01:54:46 +00:00
zhouxudong 0e710b9f82 * Fix bug #13765. 2022-04-01 09:36:18 +08:00
mayue db41ae487b * Fix bug #17360. 2022-04-01 09:15:57 +08:00
Zongjun Lan 0f7022d102 * fix bug #20310 2022-04-01 09:06:01 +08:00
Wenrui LI c96c0140a5 * add comment. 2022-04-01 08:59:44 +08:00
Wenrui LI 0a843861bf * fix case. 2022-04-01 08:58:35 +08:00
Wenrui LI 7ecc17b836 * format code. 2022-04-01 08:57:30 +08:00
王怡栋 0b6ce07f84 Merge branch 'sprint/fixbug_hufangzhou_execdoclib' into 'master'
* Fix bug of child stage.

See merge request easycorp/zentaopms!2669
2022-04-01 00:50:50 +00:00
李玉春 3a557ad1f3 Merge branch 'mayue_fix_bug#21345' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!2686
2022-04-01 00:40:41 +00:00
mayue b15719692d * Optimize code. 2022-04-01 08:36:46 +08:00
tianshujie 52208fb2b3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-01 08:14:33 +08:00
孙广明 5cc345e666 Merge branch 'master_xieqiyu_19665' into 'master'
* Fix bug#19665.

See merge request easycorp/zentaopms!2676
2022-03-31 09:42:04 +00:00
李玉春 2549143e76 Merge branch 'sunhuawei_fixbug_15288' into 'master'
Sunhuawei fixbug 15288

See merge request easycorp/zentaopms!2675
2022-03-31 09:23:25 +00:00
孙华伟 3d06589695 *Optimize the code. 2022-03-31 17:13:15 +08:00
tianshujie a9c1c80aef Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-31 17:01:33 +08:00
孙广明 d72c9123fa Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2679
2022-03-31 08:55:46 +00:00
tianshujie f8981467e4 * Fix bug #19714. 2022-03-31 16:44:45 +08:00
mayue f120ed912a * Fix bug #21345. 2022-03-31 16:40:47 +08:00
xieqiyu 2a57f4fd28 * Fix bug#19665. 2022-03-31 16:08:33 +08:00
tianshujie deeced3e14 * Fix bug #21307. 2022-03-31 16:04:41 +08:00
tianshujie e655e4fad1 * Fix bug #18035. 2022-03-31 15:55:49 +08:00
孙华伟 0ed070fd28 Optimize the code. 2022-03-31 15:52:15 +08:00
孙华伟 5c9862a129 *Fix bug#15288. 2022-03-31 15:48:53 +08:00
孙广明 4e2f0a3d86 Merge branch 'master_xieqiyu_19273' into 'master'
* Fix bug#19273.

See merge request easycorp/zentaopms!2666
2022-03-31 07:24:15 +00:00
xieqiyu 6551f617c6 * Modify review code. 2022-03-31 15:22:48 +08:00
孙广明 50f370f185 Merge branch 'sprint/tianshujie_bug21300' into 'master'
* Fix bug #21300.

See merge request easycorp/zentaopms!2673
2022-03-31 07:21:28 +00:00
孙广明 0a2abf6cb9 Merge branch 'master_xieqiyu_19197' into 'master'
* Fix bug#19197.

See merge request easycorp/zentaopms!2667
2022-03-31 07:18:21 +00:00
孙广明 1746814316 Merge branch 'sprint/master_zhouxudong_17123' into 'master'
* Fix bug #17123.

See merge request easycorp/zentaopms!2672
2022-03-31 07:18:02 +00:00
tianshujie b1bb3b7400 * Fix bug #21300. 2022-03-31 15:15:24 +08:00
zhouxudong 2b69acf643 * Fix bug #17123. 2022-03-31 14:55:04 +08:00
孙广明 5e8b3f2249 Merge branch 'fixbugs_zhouxin_21333' into 'master'
* Fix bug #21333.

See merge request easycorp/zentaopms!2668
2022-03-31 06:33:31 +00:00