Commit Graph
33612 Commits
Author SHA1 Message Date
liyuchun 7ed9d7aab3 * Fix task #48612. 2022-02-11 08:40:07 +08:00
liyuchun e556307ba4 * Finish task #48612. 2022-02-11 08:13:20 +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
孙华伟 e3c814d41d *Code for bug #48664. 2022-02-09 16:13:43 +08:00
李玉春 0202f6333d Merge branch 'devops21_zhangzilong_19255' into 'devops21'
* Code for bug #19255.

See merge request easycorp/zentaopms!1743
2022-02-09 08:02:14 +00:00
zhangzilong 51d376d4f3 * Code for bug #19255. 2022-02-09 16:01:28 +08:00
孙华伟 9d88bfccfb *Code for bug #48664. 2022-02-09 15:58:14 +08:00
李玉春 4de6f91004 Merge branch 'devops21_zhangzilong_19161' into 'devops21'
* Fix bug #19161

See merge request easycorp/zentaopms!1742
2022-02-09 07:51:17 +00:00
zhangzilong 21faf4f026 * Add update16.3.sql for bug #19161. 2022-02-09 15:41:23 +08:00
孙华伟 cc92cac012 *Code for bug #48664. 2022-02-09 15:33:45 +08:00
孙华伟 cad3583170 * Code for bug #48664. 2022-02-09 15:19:10 +08:00
李玉春 ab5ddcf710 Merge branch 'devops_caoyanyi_gitlab' into 'devops21'
Devops caoyanyi gitlab

See merge request easycorp/zentaopms!1736
2022-02-09 07:07:20 +00:00
zhangzilong ddbfc3770d * Code for bug #19161. 2022-02-09 15:05:51 +08:00
zhangzilong a4e02734f6 * Code for bug 19255. 2022-02-09 15:03:33 +08:00
caoyanyi 583dd0bcd8 * Modify data type. 2022-02-09 05:28:26 +00:00
caoyanyi 8b2dfe101b * Modify config data. 2022-02-09 05:26:27 +00:00
王怡栋 ea2d66f7de Merge branch 'devops21_liyuchun' into 'devops21'
Finish task #48616,#48617.

See merge request easycorp/zentaopms!1735
2022-02-09 05:04:48 +00:00
孙广明 c476667d96 Merge branch 'devops21_liyuchun_48618' into 'devops21'
* Finish task #48618.

See merge request easycorp/zentaopms!1731
2022-02-09 03:54:09 +00:00
zhangzilong 805dd01dc7 * Code for bug #19161. 2022-02-09 11:35:27 +08:00
caoyanyi 29a08fae7d * Modify version compare. 2022-02-09 03:11:47 +00:00
liyuchun 04edbef345 * Finish task #48616. 2022-02-09 10:31:02 +08:00
孙华伟 dff60a8c7d Fix bug #48664 2022-02-09 10:26:41 +08:00
liyuchun 845b7a6417 * Finish task #48617. 2022-02-09 10:21:05 +08:00
liyuchun a27c922f05 * Adjsut code style. 2022-02-09 10:00:57 +08:00
李玉春 e54cadfb50 Merge branch 'devops21_zhangzilong_19255' into 'devops21'
* Fix bug #19255.

See merge request easycorp/zentaopms!1730
2022-02-09 01:57:02 +00:00
zhangzilong 3c8b864a94 * Code for bug #19255. 2022-02-09 09:52:58 +08:00
李玉春 f10948fa80 Merge branch 'devops21_48605' into 'devops21'
zg:任务48605

See merge request easycorp/zentaopms!1728
2022-02-09 01:48:13 +00:00
zenggang ca4bab2feb * Adjust code 2022-02-09 01:45:58 +00:00
liyuchun 23cb9b41ef * Finish task #48618. 2022-02-09 09:38:47 +08:00
caoyanyi 9c63fb1542 * Adjust code. 2022-02-09 01:20:08 +00:00
caoyanyi 2262ae20c2 * Modify jenkins locate. 2022-02-09 00:44:26 +00:00
liyuchun a8db9fe1cd * Finish task #48618. 2022-02-08 17:44:02 +08:00
zhangzilong ec4003a9a0 * Fix bug #19255. 2022-02-08 15:50:12 +08:00
zenggang 1c667f6e63 * Finish task#48605 2022-02-08 07:44:24 +00:00
李玉春 11f82e3db8 Merge branch 'devops_caoyanyi_48607' into 'devops21'
* Finish task #48607.

See merge request easycorp/zentaopms!1723
2022-02-08 06:56:31 +00:00
李玉春 d64b74b285 Merge branch 'devops21_caoyanyi' into 'devops21'
* Finish task #48606.

See merge request easycorp/zentaopms!1717
2022-02-08 06:30:56 +00:00
caoyanyi bfca373bca * Modify url create. 2022-02-08 06:29:36 +00:00
caoyanyi 0043fe9a8f * Add param to url. 2022-02-08 06:22:20 +00:00
caoyanyi 13f86ba2bf * Modify null data. 2022-02-08 06:13:26 +00:00
李玉春 1657a135f1 Merge branch 'devops21_zhangzilong_18305' into 'devops21'
* Fix bug #18305.

See merge request easycorp/zentaopms!1721
2022-02-08 06:13:24 +00:00
caoyanyi cd560f74b3 * Finish task #48614. 2022-02-08 05:39:57 +00:00