Commit Graph
39506 Commits
Author SHA1 Message Date
孙广明 cfc43ece4f Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76483

See merge request easycorp/zentaopms!6271
2022-11-21 02:59:58 +00:00
lanzongjun 8b84363de8 * Fix task #76483 2022-11-21 10:58:48 +08:00
王怡栋 d9e22f5976 * fix bug #29670. 2022-11-21 10:48:07 +08:00
孙广明 6d9a360ef2 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76458

See merge request easycorp/zentaopms!6269
2022-11-21 02:38:46 +00:00
lanzongjun 4dce7205ac * Fix task #76458 2022-11-21 10:36:28 +08:00
孙广明 34160ea306 Merge branch 'master_xieqiyu_76492' into 'master'
* Fix bug#29461.

See merge request easycorp/zentaopms!6263
2022-11-21 02:28:19 +00:00
孙广明 47796aa876 Merge branch 'sprint/zentaopms262_mayue_bug#29684' into 'master'
* Fix bug #29684.

See merge request easycorp/zentaopms!6268
2022-11-21 02:28:08 +00:00
mayue d0908ccdde * Fix bug #29684. 2022-11-21 10:26:37 +08:00
Yagami 66bc58139f * Finish task #76486. 2022-11-21 10:23:28 +08:00
xieqiyu bdb570c00e * Fix bug#29461. 2022-11-21 09:43:56 +08:00
Yagami 8f62d5e947 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-21 09:31:24 +08:00
Yagami adb1434d5b * Finish task #76491. 2022-11-21 09:31:09 +08:00
王怡栋 e993d07670 * fix bug for show build. 2022-11-21 09:29:19 +08:00
王怡栋 e55339258b Merge branch 'master_feedback_1353' into 'master'
* Resolved feedback #1353.

See merge request easycorp/zentaopms!6015
2022-11-21 01:16:39 +00:00
王怡栋 68e6f5695f Merge branch 'master_feedback_1468' into 'master'
* Adjust code for feedback #1468.

See merge request easycorp/zentaopms!6261
2022-11-21 00:53:18 +00:00
liuhong efb20b02d8 * Adjust code for feedback #1468. 2022-11-21 00:01:24 +00:00
孙广明 9ec22b0b7d Merge branch 'sprint/zentaopms262_mayue_bug#29687' into 'master'
* Fix bug #29687.

See merge request easycorp/zentaopms!6259
2022-11-18 11:23:39 +00:00
王怡栋 40e9827d45 Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6260
2022-11-18 08:29:41 +00:00
王怡栋 1db91b628a Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #29442#29695

See merge request easycorp/zentaopms!6258
2022-11-18 08:28:55 +00:00
mayue d264eb022c * Fix bug #29687. 2022-11-18 16:25:18 +08:00
王怡栋 29cddd773a * fix bug #75779. 2022-11-18 16:25:14 +08:00
lanzongjun 8ef4f02bf8 * Fix bug #29442#29695 2022-11-18 15:38:59 +08:00
王怡栋 d8f5a8bb60 Merge branch 'tianshujie_css' into 'master'
* Modify the execution name width problem in the execution list.

See merge request easycorp/zentaopms!6253
2022-11-18 07:23:13 +00:00
王怡栋 28f7de276c Merge branch 'master_xieqiyu_76490' into 'master'
* Fix bug#29677.

See merge request easycorp/zentaopms!6252
2022-11-18 07:22:17 +00:00
王怡栋 7961c8bc55 Merge branch 'master_feedback_1468' into 'master'
Master feedback 1468

See merge request easycorp/zentaopms!6251
2022-11-18 07:22:01 +00:00
王怡栋 68eb73e7ff Merge branch 'zentaopms_261_bug_#29977' into 'master'
* Fix bug #29977.

See merge request easycorp/zentaopms!6250
2022-11-18 07:21:02 +00:00
王怡栋 c4c367d34a Merge branch 'cyy_bug' into 'master'
* Fix bug #29974.

See merge request easycorp/zentaopms!6249
2022-11-18 07:20:38 +00:00
王怡栋 350d74575e Merge branch 'master_xieqiyu_29990' into 'master'
* Fix bug#29990.

See merge request easycorp/zentaopms!6248
2022-11-18 07:20:08 +00:00
王怡栋 abfdcaa4f5 Merge branch 'zentaopms_261_bug_#29948' into 'master'
* Fix bug #29948.

See merge request easycorp/zentaopms!6247
2022-11-18 07:19:49 +00:00
王怡栋 c291211ac9 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76459

See merge request easycorp/zentaopms!6246
2022-11-18 07:19:36 +00:00
xieqiyu de8cfb9fec * Fix bug#29997. 2022-11-18 15:19:18 +08:00
王怡栋 47dd0a2a4d Merge branch 'zentaopms_258_bug#29942' into 'master'
* Fix bug #29942.

See merge request easycorp/zentaopms!6245
2022-11-18 07:19:03 +00:00
lanzongjun 0b2bb1a273 * Fix bug #29442#29695 2022-11-18 15:18:57 +08:00
王怡栋 a8e22a8884 Merge branch 'zentaopms_261_bug_#29653' into 'master'
* Fix bug #29653.

See merge request easycorp/zentaopms!6244
2022-11-18 07:18:49 +00:00
王怡栋 6164fa0c69 Merge branch 'zentaopms_258_bug#29959' into 'master'
* Fix bug #29959.

See merge request easycorp/zentaopms!6243
2022-11-18 07:18:30 +00:00
王怡栋 07117610a7 Merge branch 'zentaopms_261_bug_#29931' into 'master'
* Fix bug #29931.

See merge request easycorp/zentaopms!6242
2022-11-18 07:17:53 +00:00
王怡栋 988f80e133 Merge branch 'zentaopms261_wyd' into 'master'
* adjust for create release.

See merge request easycorp/zentaopms!6257
2022-11-18 07:10:55 +00:00
王怡栋 07c1b0cc45 * adjust for create release. 2022-11-18 15:09:21 +08:00
tianshujie 37c83b3d36 * Fix bug #29714. 2022-11-18 14:58:10 +08:00
lanzongjun 35fd254797 * Fix bug create execution 2022-11-18 14:57:52 +08:00
tianshujie e0b893114e * Fix bug #29842. 2022-11-18 14:46:06 +08:00
王怡栋 8aeb743c8f Merge branch 'zentaopms261_wyd' into 'master'
Zentaopms261 wyd

See merge request easycorp/zentaopms!6255
2022-11-18 06:42:59 +00:00
Yagami 427d5947c5 * Fix bug #29443. 2022-11-18 14:41:25 +08:00
caoyanyi c038cce9b5 * Modify feedback for test case import. 2022-11-18 14:34:20 +08:00
王怡栋 1c0129945c * code for task #76439,76440. 2022-11-18 14:25:24 +08:00
tianshujie 6faaaf865c * Fix bug #29847. 2022-11-18 14:24:41 +08:00
tianshujie 5a0280b506 * Fix bug #29923. 2022-11-18 14:22:08 +08:00
tianshujie 76a2357f56 * Fix bug #29973. 2022-11-18 14:12:20 +08:00
lanzongjun da5f7e860b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-11-18 14:07:23 +08:00
tianshujie 22b1c539f6 * Modify the execution name width problem in the execution list. 2022-11-18 14:00:34 +08:00