Commit Graph
30777 Commits
Author SHA1 Message Date
孙广明 19c7ce9a37 Merge branch 'mayue_fix_bug#21435' into 'master'
* Fix bug #21435.

See merge request easycorp/zentaopms!2724
2022-04-02 02:23:21 +00:00
孙广明 3718a90a21 Merge branch 'master_xieqiyu_21383' into 'master'
* Fix bug#21383.

See merge request easycorp/zentaopms!2713
2022-04-02 02:19:05 +00:00
孙广明 3e8175b22e Merge branch 'master_xieqiyu_21385' into 'master'
* Fix bug#21385.

See merge request easycorp/zentaopms!2711
2022-04-02 02:18:37 +00:00
mayue f54b38b241 * Fix bug #21435. 2022-04-02 10:15:33 +08:00
李玉春 d993fe3734 Merge branch 'sunhuawei_fixbug_21235' into 'master'
Sunhuawei fixbug 21235

See merge request easycorp/zentaopms!2665
2022-04-01 09:22:07 +00:00
李玉春 bff38426e0 Merge branch 'sunhuawei_fixbug_20272' into 'master'
*Fix bug#20272.

See merge request easycorp/zentaopms!2703
2022-04-01 09:21:12 +00:00
李玉春 82647a8138 Merge branch 'sunhuawei_fixbug_19073' into 'master'
*Fix bug#19073.

See merge request easycorp/zentaopms!2707
2022-04-01 09:20:25 +00:00
tianshujie 4503f0b9d8 * Fix bug #12208. 2022-04-01 15:50:34 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
tianshujie 7cc5ae09e2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-01 14:42:43 +08:00
xieqiyu 638d4bd8b8 * Fix bug#21383. 2022-04-01 14:40:38 +08:00
孙广明 8f7c929c4a Merge branch 'fixbugs_zhouxin_20288' into 'master'
* Fix bug #20288.

See merge request easycorp/zentaopms!2709
2022-04-01 06:36:42 +00:00
孙广明 f0760ea0f6 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2712
2022-04-01 06:36:24 +00:00
zhouxin b980998c42 * Fix bug 20288. 2022-04-01 06:35:26 +00:00
tianshujie 7407aabc00 * Fix bug #19104. 2022-04-01 14:32:00 +08:00
zhouxin 4f195dceba * Fix bug #20288. 2022-04-01 06:31:52 +00:00
xieqiyu c5eb774fdd * Fix bug#21385. 2022-04-01 14:24:05 +08:00
孙广明 38e5c5d2f5 Merge branch 'fixbugs_zhouxin_11804' into 'master'
* Fix bug #11804.

See merge request easycorp/zentaopms!2710
2022-04-01 06:23:23 +00:00
zhouxin 52f8024543 * Fix bug #20288. 2022-04-01 06:17:30 +00:00
孙华伟 2c5a94c243 *Fix bug#19073. 2022-04-01 14:12:09 +08:00
孙广明 3c502198a8 Merge branch 'mayue_fix_bug#16601' into 'master'
* Fix bug #16601.

See merge request easycorp/zentaopms!2705
2022-04-01 06:05:55 +00:00
tianshujie b9dc9b118e * Fix bug #19676. 2022-04-01 14:05:06 +08:00
孙广明 c29914b58b Merge branch 'mayue_fix_bug#20316' into 'master'
* Fix bug #20316.

See merge request easycorp/zentaopms!2674
2022-04-01 06:04:15 +00:00
mayue d4eb0ef746 * Fix bug #16601. 2022-04-01 14:02:22 +08:00
tianshujie 6efb224b7b * Fix bug #18033. 2022-04-01 13:39:36 +08:00
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
孙华伟 05a4805660 *Fix bug#20272. 2022-04-01 11:27:47 +08:00
zhouxin b09c75a026 * Fix bug #11804. 2022-04-01 03:11:21 +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
孙华伟 c7ad6e6e4d Update control.php 2022-04-01 02:19:51 +00: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