 李玉春
|
35b891f4ed
|
Merge branch 'sprint/235_liumengyi_bug' into 'master'
* Finish task #66996.
See merge request easycorp/zentaopms!5223
|
2022-09-01 01:29:40 +00:00 |
|
|
liumengyi
|
0b0627ef7a
|
* Finish task #66996.
|
2022-09-01 09:15:52 +08:00 |
|
|
liumengyi
|
5f99224063
|
* Finish task #66996.
|
2022-09-01 09:14:25 +08:00 |
|
|
李玉春
|
1c4d7dc5e5
|
Merge branch 'sprint/235_tianshujie_bug' into 'master'
* Finish task #66996.
See merge request easycorp/zentaopms!5222
|
2022-09-01 01:06:43 +00:00 |
|
|
tianshujie
|
c9c090e511
|
* Finish task #66996.
|
2022-09-01 09:04:41 +08:00 |
|
|
孙广明
|
27d28d2027
|
Merge branch 'sprint/235_tianshujie_66996' into 'master'
* Finish task #66996.
See merge request easycorp/zentaopms!5220
|
2022-09-01 00:38:34 +00:00 |
|
|
孙广明
|
c484efc345
|
Merge branch 'sprint/max44_mayue_bug#27112' into 'master'
* Fix bug #27112.
See merge request easycorp/zentaopms!5217
|
2022-09-01 00:35:14 +00:00 |
|
|
tianshujie
|
83802fc922
|
* Finish task #66996.
|
2022-09-01 08:28:40 +08:00 |
|
|
mayue
|
c1c4a8349b
|
* Optimize code.
|
2022-08-31 17:10:08 +08:00 |
|
|
mayue
|
8d7cc56826
|
* Fix bug #27112.
|
2022-08-31 17:03:08 +08:00 |
|
|
李玉春
|
0bc581b21c
|
Merge branch 'sprint/235' into 'master'
Sprint/235
See merge request easycorp/zentaopms!5216
|
2022-08-31 08:19:32 +00:00 |
|
|
李玉春
|
ef485ceb59
|
Merge branch 'sprint/235_tianshujie_66996' into 'sprint/235'
* Change the highlight color of the area label.
See merge request easycorp/zentaopms!5215
|
2022-08-31 08:19:18 +00:00 |
|
|
tianshujie
|
87325381f6
|
* Change the highlight color of the area label.
|
2022-08-31 16:16:52 +08:00 |
|
|
王怡栋
|
b379600cd5
|
Merge branch 'sprint/235_dongli_bug66816' into 'sprint/235'
* Fix bug #66816.
See merge request easycorp/zentaopms!5207
|
2022-08-31 08:03:14 +00:00 |
|
|
李玉春
|
645cee0fc1
|
Merge branch 'sprint/235_tianshujie_66996' into 'sprint/235'
Sprint/235 tianshujie 66996
See merge request easycorp/zentaopms!5214
|
2022-08-31 08:00:34 +00:00 |
|
|
tianshujie
|
18413141c1
|
* Change the code style.
|
2022-08-31 15:55:17 +08:00 |
|
|
tianshujie
|
8077fe8a34
|
* Finish task #66996.
|
2022-08-31 15:39:53 +08:00 |
|
|
王怡栋
|
434207d066
|
Merge branch 'sprint235_67260' into 'master'
Sprint235 67260
See merge request easycorp/zentaopms!5198
|
2022-08-31 07:33:36 +00:00 |
|
|
王怡栋
|
b41172742f
|
Merge branch 'sprint/hufangzhou_26544' into 'master'
* Fix bug #26544.
See merge request easycorp/zentaopms!5208
|
2022-08-31 07:32:24 +00:00 |
|
|
王怡栋
|
b278f56e87
|
Merge branch 'sprint/hufangzhou_26631' into 'master'
* Fix bug 26631.
See merge request easycorp/zentaopms!5210
|
2022-08-31 07:31:31 +00:00 |
|
|
王怡栋
|
f35806ecf6
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #66994
See merge request easycorp/zentaopms!5199
|
2022-08-31 07:28:42 +00:00 |
|
|
李玉春
|
e9540f67ae
|
Merge branch 'cyy_67259' into 'master'
* Modify local img.
See merge request easycorp/zentaopms!5203
|
2022-08-31 06:54:15 +00:00 |
|
|
李玉春
|
5e463255f5
|
Merge branch 'sprint/wangzemei/26917' into 'master'
Sprint/wangzemei/26917
See merge request easycorp/zentaopms!5212
|
2022-08-31 06:53:13 +00:00 |
|
|
wangzemei
|
679eb68060
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/26917
|
2022-08-31 06:49:20 +00:00 |
|
|
wangzemei
|
ab36fead98
|
* update zui css about 26917
|
2022-08-31 06:33:14 +00:00 |
|
|
孙广明
|
0786961021
|
Merge branch 'sprint/max44_mayue_task#66993' into 'master'
Sprint/max44 mayue task#66993
See merge request easycorp/zentaopms!5202
|
2022-08-31 06:24:59 +00:00 |
|
|
hufangzhou
|
9d14b9440c
|
* Fix bug 26631.
|
2022-08-31 14:09:01 +08:00 |
|
|
wangzemei
|
2635e0031a
|
* Fix bug #26917
|
2022-08-31 05:52:20 +00:00 |
|
|
mayue
|
b9efaee057
|
* Optimize code.
|
2022-08-31 13:39:59 +08:00 |
|
|
王怡栋
|
2fe99a943b
|
Merge branch 'sprint231_zg_unit' into 'master'
* Sprint231 unit
See merge request easycorp/zentaopms!5189
|
2022-08-31 05:38:04 +00:00 |
|
|
王怡栋
|
9ac45e6149
|
Merge branch 'master_xieqiyu_66954' into 'master'
* Finish task#66954,#66960,#66959,#66958,#66956.
See merge request easycorp/zentaopms!5206
|
2022-08-31 05:37:39 +00:00 |
|
|
xieqiyu
|
0fac1d1e95
|
* Code for task#66954.
|
2022-08-31 13:36:02 +08:00 |
|
|
hufangzhou
|
abd43d06af
|
* Fix bug #26544.
|
2022-08-31 13:23:12 +08:00 |
|
|
mayue
|
197e3d6ec4
|
* Fix error tips.
|
2022-08-31 13:16:22 +08:00 |
|
|
xieqiyu
|
0cd8ce30cd
|
* Finish task#66954,#66960,#66959,#66958,#66956.
|
2022-08-31 12:35:45 +08:00 |
|
|
王怡栋
|
4f8810a8e9
|
Merge branch 'sprint/hufangzhou_26586' into 'master'
* Fix bug #26586.
See merge request easycorp/zentaopms!5205
|
2022-08-31 03:59:05 +00:00 |
|
|
hufangzhou
|
61f6b1609f
|
* Fix bug #26586.
|
2022-08-31 11:14:08 +08:00 |
|
|
caoyanyi
|
a2bfbcb5af
|
* Modify local img.
|
2022-08-31 10:38:33 +08:00 |
|
|
李玉春
|
6e817e6d24
|
Merge branch 'cyy_67259' into 'master'
* Finish task #67259.
See merge request easycorp/zentaopms!5201
|
2022-08-31 02:10:33 +00:00 |
|
|
caoyanyi
|
94f2e93d0e
|
* Finish task #67259.
|
2022-08-31 09:40:04 +08:00 |
|
|
mayue
|
451bccf572
|
* Optimize regex.
|
2022-08-30 17:09:15 +08:00 |
|
|
lanzongjun
|
0b339fa0d7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-08-30 16:12:43 +08:00 |
|
|
lanzongjun
|
0afb47e9df
|
* fix task #66994
|
2022-08-30 16:12:02 +08:00 |
|
|
mayue
|
b03bdfa09e
|
* Finish task #66993.
|
2022-08-30 16:11:54 +08:00 |
|
|
tianshujie
|
b9190b8d92
|
* Solve bug link bug search all products reported errors.
|
2022-08-30 15:14:36 +08:00 |
|
|
zenggang
|
5c9187ce29
|
* sprint235_unit
|
2022-08-30 06:58:40 +00:00 |
|
|
王怡栋
|
9b456c830c
|
Merge branch 'max44_tanghucheng' into 'master'
* Fix bug .
See merge request easycorp/zentaopms!5197
zentaopms_17.6
|
2022-08-30 06:53:55 +00:00 |
|
|
tanghucheng
|
5cb74fee0b
|
* Fix bug .
|
2022-08-30 14:50:49 +08:00 |
|
|
zenggang
|
6c48f5ec97
|
* Finish task#67260
|
2022-08-30 06:39:36 +00:00 |
|
|
王怡栋
|
c6f4f5445f
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug flex
See merge request easycorp/zentaopms!5196
|
2022-08-30 06:36:30 +00:00 |
|