Commit Graph
47666 Commits
Author SHA1 Message Date
Yagami 8e481418df * Finish task #76107. 2022-11-14 16:20:32 +08:00
王怡栋 af8098e545 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-14 16:20:31 +08:00
王怡栋 27086ff4a2 * fix bug. 2022-11-14 16:20:23 +08:00
wangyuting f16bef503e * Fix bug. 2022-11-14 07:59:22 +00:00
wangyuting da374c2994 * Optimize code. 2022-11-14 07:56:51 +00:00
wangyuting bb5b3426f6 * Finish task #76032. 2022-11-14 07:55:25 +00:00
daitingting 32337194dd * Adjust for feature review. 2022-11-14 07:46:56 +00:00
mayue 8d5055570d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-14 15:17:07 +08:00
王怡栋 1453678c82 Merge branch 'zentaopms261_wyd' into 'master'
* code for task #76034,76033.

See merge request easycorp/zentaopms!6136
2022-11-14 07:06:09 +00:00
王怡栋 ddc8fa8aff Merge branch 'zentaopms_258_bug#29709' into 'master'
* Fix bug #29709.

See merge request easycorp/zentaopms!6133
2022-11-14 07:03:44 +00:00
王怡栋 3bb6b7247c Merge branch 'zentaopms_258_wangyuting' into 'master'
* Fix build pairs bug.

See merge request easycorp/zentaopms!6132
2022-11-14 07:03:29 +00:00
孙广明 df539f3e38 Merge branch 'master_xieqiyu_75909' into 'master'
* Fix bug#29441.

See merge request easycorp/zentaopms!6135
2022-11-14 06:57:28 +00:00
孙广明 eb435f5637 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #75911#75904

See merge request easycorp/zentaopms!6134
2022-11-14 06:57:03 +00:00
孙广明 3288531ed0 Merge branch 'sprint/zentaopms262_mayue_bug#29410' into 'master'
Sprint/zentaopms262 mayue bug#29410

See merge request easycorp/zentaopms!6130
2022-11-14 06:55:54 +00:00
lanzongjun 991253d2a8 remove code 2022-11-14 14:48:18 +08:00
mayue e45a22f25d * Fix bug #29410. 2022-11-14 14:47:50 +08:00
xieqiyu 5ee8a7e1ac * Fix bug#29441. 2022-11-14 14:46:19 +08:00
lanzongjun 7bb291664c * finish task #75904 2022-11-14 14:44:00 +08:00
lanzongjun d6c741c436 * finish task #75911 2022-11-14 14:35:55 +08:00
王怡栋 e97e7ab9b5 * code for task #76034,76033. 2022-11-14 14:34:07 +08:00
wangyuting 39a9482726 * Fix bug #29709. 2022-11-14 06:25:51 +00:00
孙广明 be14a72a9f Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #75896

See merge request easycorp/zentaopms!6129
2022-11-14 06:05:01 +00:00
wangyuting 5acbf81057 * Fix build pairs bug. 2022-11-14 06:04:19 +00:00
孙广明 5f0f0362a2 Merge branch 'master_xieqiyu_75901' into 'master'
* Fix bug#29465.

See merge request easycorp/zentaopms!6131
2022-11-14 06:03:18 +00:00
mayue b73394842c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-14 13:56:03 +08:00
xieqiyu fe65019d7f * Fix bug#29465. 2022-11-14 13:47:01 +08:00
Yagami 8d71c2615c * Fix keep-login bug. 2022-11-14 13:40:44 +08:00
mayue 3457c2ade6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-14 13:02:02 +08:00
lanzongjun e045ce8322 * finish task #75896 2022-11-14 11:24:50 +08:00
王怡栋 e4dccd020b Merge branch 'zentaopms_258_wangyuting' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6128
2022-11-14 03:17:27 +00:00
wangyuting def5bab5f4 * Fix bug. 2022-11-14 03:09:41 +00:00
mayue 03ff3c3b36 * Optimize page style. 2022-11-14 10:55:28 +08:00
孙广明 461aa69449 Merge branch 'master_xieqiyu_29549' into 'master'
* Fix bug#29549,#29654.

See merge request easycorp/zentaopms!6126
2022-11-14 00:27:23 +00:00
wangyidong 9406625989 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-11 17:35:59 +08:00
wangyidong 549290cf9d * fix bug for create project release. 2022-11-11 17:35:34 +08:00
xieqiyu fde21ff897 * Fix bug#29549,#29654. 2022-11-11 17:06:48 +08:00
孙广明 a4785c2760 Merge branch 'sprint/zentaopms259_mayue_task#75649' into 'master'
* Finish task #75649.

See merge request easycorp/zentaopms!6125
2022-11-11 09:03:28 +00:00
mayue c92e9f119a * Finish task #75649. 2022-11-11 17:02:17 +08:00
王怡栋 bf598b3f86 Merge branch 'testcase_zg' into 'master'
* Adjust code

See merge request easycorp/zentaopms!6123
2022-11-11 07:35:17 +00:00
王怡栋 31a84ce03c Merge branch 'zentaopms_258_wangyuting' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6124
2022-11-11 07:34:43 +00:00
wangyuting bec09e5a0a * Adjust isFeature to canConfigFeature. 2022-11-11 07:28:46 +00:00
wangyuting e94c895d51 * Optimize code. 2022-11-11 07:22:33 +00:00
wangyuting bb49320ee7 * Fix bug. 2022-11-11 07:07:17 +00:00
zenggang 6aa84d40f4 * Adjust code 2022-11-11 06:55:59 +00:00
孙广明 f59a0d4ade Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish bug #29448#29404

See merge request easycorp/zentaopms!6120
2022-11-11 06:51:06 +00:00
孙广明 be11caa710 Merge branch 'master_xieqiyu_29618' into 'master'
* Fix bug#29618.

See merge request easycorp/zentaopms!6122
2022-11-11 06:50:47 +00:00
孙广明 ca3de7cc84 Merge branch 'lyk_feedback_1411' into 'master'
* Resolve feedback #1411.

See merge request easycorp/zentaopms!6121
2022-11-11 06:50:22 +00:00
zenggang 9a3ee4027f * Adjust code 2022-11-11 06:49:04 +00:00
xieqiyu 38dd19a6c3 * Fix bug#29551. 2022-11-11 14:34:51 +08:00
lanzongjun 0d07d33818 * finish bug #29404 2022-11-11 14:04:25 +08:00