Commit Graph
35315 Commits
Author SHA1 Message Date
孙广明 e43dddd2dd Merge branch 'devops24_liyuchun' into 'devops24'
Fix bug 20580.

See merge request easycorp/zentaopms!2404
2022-03-22 00:35:07 +00:00
liyuchun 8b2d19b30c * Fix bug #20580. 2022-03-21 16:47:57 +08:00
liyuchun df358d29ef * Fix bug #50954. 2022-03-21 13:14:44 +08:00
孙广明 fe214852d4 Merge branch 'devops24_liyuchun' into 'devops24'
Fix bug #19698.

See merge request easycorp/zentaopms!2380
2022-03-21 02:57:15 +00:00
liyuchun 8efe478798 * Fix bug #19231,19230. 2022-03-21 10:15:36 +08:00
liyuchun 1afae98bfc * Fix bug #50910. 2022-03-18 17:14:09 +08:00
李玉春 b0607bb683 Merge branch 'devops23_cyy' into 'devops24'
Fix bug #17048, 20588.

See merge request easycorp/zentaopms!2374
2022-03-18 09:08:39 +00:00
李玉春 197c45d292 Merge branch 'devops24_51105' into 'devops24'
Finish task#51105,51102,51106

See merge request easycorp/zentaopms!2369
2022-03-18 09:06:53 +00:00
caoyanyi 249a5c1ecc * Fix bug #17048. 2022-03-18 14:49:30 +08:00
caoyanyi 5865f3ab34 * Fix bug #20588. 2022-03-18 14:26:57 +08:00
zenggang d048268f4d * Finish task#51106 2022-03-18 06:20:44 +00:00
zenggang ed17f3b7bb * Finish task#51105,51102 2022-03-18 05:17:53 +00:00
李玉春 307c410724 Merge branch 'devops24_50667' into 'devops24'
Finish task#50667,50675

See merge request easycorp/zentaopms!2349
2022-03-18 01:03:32 +00:00
zenggang dae974455f * Adjust code 2022-03-18 01:02:35 +00:00
zenggang 414ec1b308 * Finish task#50667,50675 2022-03-17 09:05:02 +00:00
liyuchun b6db2c5c55 * Fix bug #50908. 2022-03-17 16:11:19 +08:00
李玉春 e822d8f7e5 Merge branch 'devops_cyy_bug' into 'devops24'
Fix bug #12206, 12342.

See merge request easycorp/zentaopms!2337
2022-03-17 06:59:33 +00:00
caoyanyi d8c594e873 * Fix bug 12342. 2022-03-17 13:58:15 +08:00
李玉春 4ee7dc75de Merge branch 'devops24_50697' into 'devops24'
Code for task#50697,50685

See merge request easycorp/zentaopms!2328
2022-03-17 05:57:15 +00:00
zenggang 70d00fad9e * Code for task#50697,50685 2022-03-17 03:07:38 +00:00
caoyanyi a0548058e5 * Fix bug #12206. 2022-03-17 10:52:40 +08:00
孙广明 33da6a026f Merge branch 'devops24_liyuchun_50711' into 'devops24'
Fix bug #50711

See merge request easycorp/zentaopms!2311
2022-03-16 13:59:03 +00:00
孙广明 484dae9ad5 Merge branch 'devops24_liyuchun_gitlab' into 'devops24'
在合并请求列表增加提交人

See merge request easycorp/zentaopms!2317
2022-03-16 13:58:34 +00:00
liyuchun 0417b3a1e2 * Add author in mr list. 2022-03-16 17:24:27 +08:00
李玉春 92e66fda8d Merge branch 'devops24_cyy' into 'devops24'
Fix bug #20626.

See merge request easycorp/zentaopms!2302
2022-03-16 07:51:47 +00:00
caoyanyi 5d45880fde * Adjust code. 2022-03-16 15:50:22 +08:00
liyuchun 0664eaef01 * Fix bug #50711. 2022-03-16 15:38:33 +08:00
caoyanyi 4c0d583520 * Fix bug #20626. 2022-03-16 14:15:34 +08:00
李玉春 8821746cf7 Merge branch 'devops24_50685' into 'devops24'
Finish task#50685,50680,50672

See merge request easycorp/zentaopms!2297
2022-03-16 06:02:29 +00:00
zenggang 4464d75123 * Finish task#50685,50680,50672 2022-03-16 05:20:20 +00:00
李玉春 c28399fe0e Merge branch 'devops24_cyy' into 'devops24'
完成任务 #50656,50763

See merge request easycorp/zentaopms!2286
2022-03-16 01:47:20 +00:00
caoyanyi 431affa4a1 * Modify style. 2022-03-16 09:30:51 +08:00
caoyanyi 08ce5f0ea2 * Modify repo list. 2022-03-16 09:21:13 +08:00
caoyanyi bb7f149437 * Finish task #50656. 2022-03-16 09:08:02 +08:00
李玉春 0bb68c3871 Merge branch 'devops24_50669' into 'devops24'
Finish task#50669,50670

See merge request easycorp/zentaopms!2281
2022-03-16 01:04:43 +00:00
zenggang f072b034f5 * Finish task#50669,50670 2022-03-15 09:29:20 +00:00
liyuchun 16709ce378 * Finish task #50659. 2022-03-15 16:58:30 +08:00
李玉春 072a170a3a Merge branch 'devops24_50694' into 'devops24'
Fix bug#50694,50689

See merge request easycorp/zentaopms!2259
2022-03-15 06:24:49 +00:00
zenggang 18772de39f * Adjust code 2022-03-15 06:19:42 +00:00
zenggang b851915f14 * Adjust code 2022-03-15 06:10:20 +00:00
zenggang 1d4cc3436c * Adjust code 2022-03-15 05:55:49 +00:00
zenggang 2431e1ccc2 * Fix bug#50694,50689 2022-03-15 02:56:31 +00:00
孙广明 99924a75a5 Merge branch 'devops24_liyuchun_50700' into 'devops24'
Fix bug #20743,#20209.

See merge request easycorp/zentaopms!2251
2022-03-15 01:40:15 +00:00
liyuchun ab5910454b * Fix bug #20743,#20209. 2022-03-15 08:40:33 +08:00
caoyanyi fb27a0a2b9 * Finish task #50673. 2022-03-14 16:52:44 +08:00
孙广明 57651b969a Merge branch 'devops24_liyuchun_50709' into 'devops24'
完成任务#50709

See merge request easycorp/zentaopms!2236
2022-03-14 08:44:38 +00:00
liyuchun b25e7a1fe7 * Fix bug #20209. 2022-03-14 16:38:41 +08:00
李玉春 645190c141 Merge branch 'devops24_cyy' into 'devops24'
处理bug #50686, #50678, #50668.

See merge request easycorp/zentaopms!2240
2022-03-14 08:35:14 +00:00
caoyanyi d1d63da7cb * Adjust code. 2022-03-14 16:35:03 +08:00
caoyanyi 5777e30c74 * Adjust code. 2022-03-14 16:34:12 +08:00