 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 |
|
|
caoyanyi
|
6f718185db
|
* Adjust code.
|
2022-03-14 16:32:56 +08:00 |
|
|
caoyanyi
|
f4f64a2ad0
|
* Adjust code.
|
2022-03-14 16:30:40 +08:00 |
|
|
李玉春
|
51eaf6cc23
|
Merge branch 'devops23_cyy_50075' into 'devops24'
Devops23 cyy 50075
See merge request easycorp/zentaopms!2234
|
2022-03-14 08:28:01 +00:00 |
|
|
caoyanyi
|
4973f92006
|
* Add locate url.
|
2022-03-14 16:21:24 +08:00 |
|
|
caoyanyi
|
1c14ab9738
|
* Modify dynamic datas.
|
2022-03-14 16:17:43 +08:00 |
|
|
caoyanyi
|
49e60b7d96
|
* Modify list style.
|
2022-03-14 15:59:40 +08:00 |
|
|
caoyanyi
|
0a2a96915b
|
* Modify default value.
|
2022-03-14 15:59:27 +08:00 |
|
|
liyuchun
|
7d40bdf1d3
|
* Finish task #50709.
|
2022-03-14 15:53:33 +08:00 |
|
|
zhujinyong
|
ea63748351
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-14 15:12:53 +08:00 |
|
|
zhujinyong
|
976299d506
|
* Fix type of fields.
|
2022-03-14 15:12:32 +08:00 |
|
|
孙广明
|
d1a3c84b57
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test of task.
See merge request easycorp/zentaopms!2232
|
2022-03-14 06:42:12 +00:00 |
|
|
liumengyi
|
3c75a1555e
|
* Add auto test of task.
|
2022-03-14 14:39:59 +08:00 |
|
|
朱金勇
|
0ba0e25d66
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade bug.
See merge request easycorp/zentaopms!2230
|
2022-03-14 06:36:24 +00:00 |
|
|
孙广明
|
140c7652ad
|
* Fix upgrade bug.
|
2022-03-14 14:23:19 +08:00 |
|
|
zhujinyong
|
b5da3ce7d5
|
* Execute xuanxuan update sql.
|
2022-03-14 13:55:52 +08:00 |
|