Commit Graph

172 Commits

Author SHA1 Message Date
caoyanyi
e4429fbadb * Modify api get group param. 2022-02-14 11:02:07 +08:00
liyuchun
26ec64058c * Fix error. 2022-02-14 08:28:13 +08:00
zenggang
b2875e7c20 * Adjust code 2022-01-28 01:17:50 +00:00
zenggang
81849859ca * Adjust code 2022-01-27 07:43:46 +00:00
zenggang
f4729ec429 * Adjust code 2022-01-27 07:23:52 +00:00
孙广明
307184ea77 Merge branch 'devops20_liyuchun' into 'master'
* Adjsut unit cases.

See merge request easycorp/zentaopms!1669
2022-01-27 05:04:51 +00:00
liyuchun
4b9ee0cc3c * Adjsut unit cases. 2022-01-27 11:16:10 +08:00
caoyanyi
9b8743c494 * Modify mr view style. 2022-01-26 08:40:55 +00:00
liyuchun
b6bf9f253d * Fix error in mr view. 2022-01-26 10:49:57 +08:00
zenggang
5f83afb622 * Unit test and adjust code 2022-01-25 08:33:21 +00:00
zenggang
5183b24bd0 * Adjust code 2022-01-25 02:37:51 +00:00
zenggang
4ab46cb2ea *Finish task#48107,48106,48105,48103 and adjust code 2022-01-25 01:13:49 +00:00
liyuchun
eba799b60f * Fix bug #18492. 2022-01-24 17:20:19 +08:00
zenggang
47e13757a8 * Adjust code 2022-01-21 05:11:52 +00:00
zenggang
e315a62440 * Adjust code 2022-01-21 02:38:51 +00:00
zenggang
36c97752b4 * Finish task#48104 2022-01-20 09:25:44 +00:00
zenggang
4b0d2e842a * Fix bug#18456,18393,18392 2022-01-17 06:49:36 +00:00
李玉春
c357477762 Merge branch 'devops18_47047' into 'master'
* Finish task#47047

See merge request easycorp/zentaopms!1272
2022-01-06 03:00:38 +00:00
zenggang
08132a448d * Adjust code 2022-01-05 06:39:32 +00:00
zenggang
79859569b3 * Finish task#47047 2022-01-05 06:24:19 +00:00
zenggang
443a00c606 * Finish task#47057 2022-01-05 02:16:33 +00:00
liyuchun
2c5d8abc45 * Fix bug #18150. 2022-01-04 16:15:17 +08:00
liyuchun
c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
王怡栋
0552eec334 * fix error. 2021-12-30 15:19:59 +08:00
王怡栋
7c5be1093e * adjust code task #46553. 2021-12-30 10:38:01 +08:00
王怡栋
134cd55f46 * adjust for task #46553. 2021-12-30 10:31:19 +08:00
王怡栋
061bf4388c * adjust for unit test. 2021-12-30 10:08:00 +08:00
王怡栋
625a6a47c4 * code for task #46553. 2021-12-30 08:38:54 +08:00
王怡栋
c1ffbd839a Merge branch 'sprint/liyuchun_devops' into 'master'
Sprint/liyuchun devops

See merge request easycorp/zentaopms!1137
2021-12-29 08:04:37 +00:00
李玉春
7d8aa9da78 Merge branch 'devops18_46549' into 'devops18'
* Finish task#46549

See merge request easycorp/zentaopms!1175
2021-12-29 03:19:45 +00:00
zenggang
8e4cfa8744 * Finish task#46549 2021-12-29 02:29:19 +00:00
王怡栋
3a6e39f834 Merge branch 'sprint/liyuchun_devops18' into 'devops18'
* Finish task #46551.

See merge request easycorp/zentaopms!1174
2021-12-29 02:25:31 +00:00
liyuchun
8e98e9831e * Finish task #46551. 2021-12-29 10:02:25 +08:00
李玉春
4270c776f1 Merge branch 'devops18_wangyidong_46552' into 'devops18'
Devops18 wangyidong 46552

See merge request easycorp/zentaopms!1173
2021-12-29 01:51:53 +00:00
王怡栋
2e7530441b * adjust for task #46552. 2021-12-29 09:49:43 +08:00
王怡栋
2a4c3cfa0e * code for task #46552. 2021-12-28 16:55:35 +08:00
liyuchun
9da21e20f0 * Finish task #46550. 2021-12-28 15:45:09 +08:00
王怡栋
667cf60e42 * code for task #46552. 2021-12-28 15:16:08 +08:00
liyuchun
dc46e684fe * Fix bug #18023. 2021-12-28 14:10:59 +08:00
liyuchun
7aff111aa4 * Add action log when create mr. 2021-12-24 13:23:44 +08:00
liyuchun
8b9207537e * Add action log when create mr. 2021-12-24 13:21:12 +08:00
zenggang
4955bd5450 * Fix bug#17909,17910 2021-12-24 02:46:49 +00:00
zenggang
b9e46558c5 * Code for task#46005 2021-12-23 09:21:51 +00:00
caoyanyi
e2f5ad2385 * Modify empty validate. 2021-12-23 05:59:42 +00:00
李玉春
66bf2a0f80 Merge branch 'devops17_wangyidong_api' into 'devops17'
* code for mr diff that is from ztool.

See merge request easycorp/zentaopms!1080
2021-12-22 09:22:08 +00:00
王怡栋
11dc36d278 * code for mr diff that is from ztool. 2021-12-22 17:17:11 +08:00
liyuchun
ca30f986e8 * Adjust code for api create mr. 2021-12-22 17:07:31 +08:00
liyuchun
7e59c27945 * Adjust api create mr. 2021-12-22 16:54:07 +08:00
liyuchun
cdbff35897 * Code for task #46003. 2021-12-22 16:12:03 +08:00
liyuchun
5dd72fd196 * Adjust api create mr. 2021-12-22 09:51:13 +08:00