Commit Graph
33651 Commits
Author SHA1 Message Date
孙广明 d5a459cabd Merge branch 'devops21_liyuchun' into 'devops21'
Fix bug #19455,19438.

See merge request easycorp/zentaopms!1767
2022-02-11 08:04:48 +00:00
liyuchun 42619874a2 * Fix bug #19445. 2022-02-11 14:59:40 +08:00
liyuchun f02be68a50 * Fix bug #19438. 2022-02-11 14:52:02 +08:00
孙广明 12847ab38e Merge branch 'devops21_liyuchun' into 'devops21'
* Finish task #48611.

See merge request easycorp/zentaopms!1764
2022-02-11 05:57:45 +00:00
李玉春 d1ceb31512 Merge branch 'devops21_zenggang' into 'devops21'
zg:修复bug19411

See merge request easycorp/zentaopms!1755
2022-02-11 05:19:09 +00:00
李玉春 4190928759 Merge branch 'sunhuawei_fixbug_19239_19367' into 'devops21'
Sunhuawei fixbug 19239 19367

See merge request easycorp/zentaopms!1758
2022-02-11 03:30:27 +00:00
liyuchun df99853767 * Finish task #48611. 2022-02-11 11:23:03 +08:00
李玉春 68d92f6b72 Merge branch 'devops_cyy' into 'devops21'
* Modify onlybody param.

See merge request easycorp/zentaopms!1763
2022-02-11 03:19:14 +00:00
zenggang 1c6ab456e9 * Adjust code 2022-02-11 03:09:58 +00:00
zenggang cbd10a7370 * Fix bug#19415 2022-02-11 03:05:03 +00:00
caoyanyi 44ab426a16 * Modify onlybody param. 2022-02-11 02:56:24 +00:00
孙华伟 df27f7e149 *Fix bug #19367 #19239. 2022-02-11 10:49:02 +08:00
李玉春 1c3d17a6d7 Merge branch 'devops_cyy' into 'devops21'
* Modify language.

See merge request easycorp/zentaopms!1761
2022-02-11 02:40:11 +00:00
caoyanyi ff348190bb * Mofify user check. 2022-02-11 02:30:49 +00:00
caoyanyi ab9946c8cd * Modify language. 2022-02-11 02:01:25 +00:00
caoyanyi cc693d6c68 * Fix bug #19418. 2022-02-11 02:00:17 +00:00
caoyanyi d551fa882f * Modify form validate. 2022-02-11 01:59:00 +00:00
caoyanyi ddb9cca1d5 * Modify language. 2022-02-11 01:38:22 +00:00
李玉春 be26aa183b Merge branch 'devops_cyy' into 'devops21'
* Modify host check.

See merge request easycorp/zentaopms!1760
2022-02-11 01:22:36 +00:00
caoyanyi b77129e525 * Modify host check. 2022-02-11 01:20:51 +00:00
zenggang ee681782d9 * Fix bug#19411 2022-02-11 01:16:22 +00:00
王怡栋 ec856c73bc Merge branch 'devops21_liyuchun_48612' into 'devops21'
* Finish task #48612.

See merge request easycorp/zentaopms!1756
2022-02-11 01:13:51 +00:00
孙华伟 341ee9d8dd Fix bug #19367 #19239 #18741 . 2022-02-11 08:59:06 +08:00
孙华伟 06f9338fad *Fix bug #19239 #19367. 2022-02-11 08:54:47 +08:00
liyuchun fc724cd56e * Adjust language. 2022-02-11 08:53:47 +08:00
liyuchun 7ed9d7aab3 * Fix task #48612. 2022-02-11 08:40:07 +08:00
李玉春 50775551a9 Merge branch 'devops_cyy_gitlab' into 'devops21'
* Modify language.

See merge request easycorp/zentaopms!1754
2022-02-11 00:26:29 +00:00
李玉春 b0e0b3856b Merge branch 'devops_caoyanyi_xuan' into 'devops21'
Devops caoyanyi xuan

See merge request easycorp/zentaopms!1750
2022-02-11 00:22:39 +00:00
liyuchun e556307ba4 * Finish task #48612. 2022-02-11 08:13:20 +08:00
zenggang e2407022e3 * Adjust code 2022-02-10 09:30:41 +00:00
caoyanyi 7be47b221e * Modify language. 2022-02-10 09:22:20 +00:00
李玉春 bb93656682 Merge branch 'devops21_sonar_caoyanyi' into 'devops21'
Devops21 sonar caoyanyi

See merge request easycorp/zentaopms!1752
2022-02-10 08:56:24 +00:00
李玉春 83b4e6828d Merge branch 'devops21_19388' into 'devops21'
zg:修复bug19388

See merge request easycorp/zentaopms!1751
2022-02-10 08:53:39 +00:00
caoyanyi d892996ee8 * Fix bug #19313. 2022-02-10 08:42:46 +00:00
caoyanyi 7a486efeb6 * Modify url title. 2022-02-10 08:33:05 +00:00
caoyanyi f93ac616e2 * Modify onlybody param. 2022-02-10 08:31:54 +00:00
caoyanyi d9449bb507 * Modify job result message. 2022-02-10 07:56:14 +00:00
zenggang d9194b2a27 * Fix bug#19388 2022-02-10 07:25:20 +00:00
caoyanyi c07619ac73 * Finish task #48604. 2022-02-10 06:57:43 +00:00
孙华伟 586af4b5de *Fix bug #48663. 2022-02-10 13:58:16 +08:00
李玉春 442a53005a Merge branch 'devops21_48603' into 'devops21'
zg:任务48603,48609,48610

See merge request easycorp/zentaopms!1747
2022-02-10 02:53:39 +00:00
zenggang a90d17abc7 * Adjust code 2022-02-10 02:50:56 +00:00
zenggang 03ba748afd * Adjust code 2022-02-10 02:38:00 +00:00
zenggang 5927cd62ad * Finish task#48603,48609,48610 2022-02-10 02:20:02 +00:00
李玉春 f7f52f101e Merge branch 'devops21_sunhuawei_fixbug_48663_48664' into 'devops21'
Devops21 sunhuawei fixbug 48663 48664

See merge request easycorp/zentaopms!1741
2022-02-10 00:07:23 +00:00
孙华伟 1f6d15cc7d *Code for bug #48664. 2022-02-09 16:52:13 +08:00
孙华伟 3795f99be6 *Code for bug #48664. 2022-02-09 16:49:02 +08:00
孙华伟 8e206e12e0 *Code for bug #48664. 2022-02-09 16:47:09 +08:00
李玉春 8d3e9fe0eb Merge branch 'devops21_zhangzilong_19161' into 'devops21'
* Fix bug #19161

See merge request easycorp/zentaopms!1744
2022-02-09 08:46:19 +00:00
zhangzilong 8d62f55bcf * Code for bug #19161. 2022-02-09 16:42:59 +08:00