 孙广明
|
fd523bb183
|
Merge branch 'fixbug_zhouxin_18746' into 'master'
* Fix bug #18746.
See merge request easycorp/zentaopms!2456
|
2022-03-22 09:14:26 +00:00 |
|
|
李玉春
|
64e9667a1f
|
Merge branch 'sprint/master_zhouxudong_16718' into 'master'
* Fix bug #16718.
See merge request easycorp/zentaopms!2458
|
2022-03-22 08:55:17 +00:00 |
|
|
zhouxudong
|
e827209fe0
|
* Fix bug #16718.
|
2022-03-22 16:37:09 +08:00 |
|
|
zhouxin
|
89a56dc374
|
* Fix bug #18746.
|
2022-03-22 08:35:13 +00:00 |
|
|
王怡栋
|
3d64ad4392
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-22 16:28:26 +08:00 |
|
|
王怡栋
|
2684fd08fe
|
* code for task #51330.
|
2022-03-22 16:27:54 +08:00 |
|
|
朱金勇
|
68dc7ba793
|
Merge branch 'app_zhengrunyu' into 'master'
*Fix api .
See merge request easycorp/zentaopms!2454
|
2022-03-22 08:27:17 +00:00 |
|
|
zhengrunyu
|
5108aab254
|
*Fix api .
|
2022-03-22 16:19:32 +08:00 |
|
|
李玉春
|
26f84d495d
|
Merge branch 'sprint/master_zhouxudong_16575' into 'master'
Sprint/master zhouxudong 16575
See merge request easycorp/zentaopms!2453
|
2022-03-22 08:18:36 +00:00 |
|
|
孙广明
|
d1a7a7f61f
|
Merge branch 'mayue_fix_bug#20098' into 'master'
Fix bug#20098.
See merge request easycorp/zentaopms!2450
|
2022-03-22 08:17:58 +00:00 |
|
|
zhouxudong
|
0800d18c92
|
* Fix bug #16575.
|
2022-03-22 16:17:00 +08:00 |
|
|
mayue
|
21b12f534f
|
Optimize code.
|
2022-03-22 16:16:39 +08:00 |
|
|
zhouxudong
|
81e4aa867a
|
* Fix bug #16575.
|
2022-03-22 16:14:28 +08:00 |
|
|
mayue
|
63300ff29e
|
Optimize code.
|
2022-03-22 16:13:52 +08:00 |
|
|
mayue
|
894cad15a2
|
Optimize code.
|
2022-03-22 16:08:29 +08:00 |
|
|
孙广明
|
8ce81869a2
|
Merge branch 'mayue_fix_bug#21052' into 'master'
* Fix bug #21052.
See merge request easycorp/zentaopms!2451
|
2022-03-22 07:58:26 +00:00 |
|
|
李玉春
|
56e4317e23
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2447
|
2022-03-22 07:55:27 +00:00 |
|
|
李玉春
|
fc22ac4658
|
Merge branch 'sunhuawei_fixbug_17397' into 'master'
*Fix bug#17397
See merge request easycorp/zentaopms!2446
|
2022-03-22 07:54:59 +00:00 |
|
|
tianshujie
|
5458aeeff9
|
* Delete useless judgment conditions.
|
2022-03-22 15:54:03 +08:00 |
|
|
孙广明
|
a2a191b421
|
Merge branch 'liyuchun_bug_17235'
|
2022-03-22 15:45:41 +08:00 |
|
|
李玉春
|
9adf7324da
|
Merge branch 'devops24_zenggang' into 'master'
Finish task#51115,51116,51120,51121,51133
See merge request easycorp/zentaopms!2445
|
2022-03-22 07:44:42 +00:00 |
|
|
孙广明
|
41eee3ddd4
|
Merge branch 'master' into 'liyuchun_bug_17235'
# Conflicts:
# module/common/model.php
|
2022-03-22 07:43:58 +00:00 |
|
|
mayue
|
ceb7030aeb
|
* Optimize code.
|
2022-03-22 15:43:04 +08:00 |
|
|
孙广明
|
a6c689e3a4
|
Merge branch 'fixbug_zhouxin_13855' into 'master'
Fix bug #13855.
See merge request easycorp/zentaopms!2448
|
2022-03-22 07:41:28 +00:00 |
|
|
孙华伟
|
a03a367c31
|
*Optimize the code.
|
2022-03-22 15:40:32 +08:00 |
|
|
孙广明
|
3444ec3102
|
Merge branch 'fixbug_zhouxin_17943' into 'master'
Fix bug #17943.
See merge request easycorp/zentaopms!2442
|
2022-03-22 07:40:26 +00:00 |
|
|
tianshujie
|
bbe26af087
|
* Fix bug #20977.
|
2022-03-22 15:38:54 +08:00 |
|
|
zhouxin
|
cebd0a33d5
|
Fix bug #13855.
|
2022-03-22 07:38:24 +00:00 |
|
|
zenggang
|
04652c0e65
|
* Adjust code
|
2022-03-22 07:34:17 +00:00 |
|
|
孙华伟
|
fb6de8f7e6
|
*Optimize the code.
|
2022-03-22 15:27:36 +08:00 |
|
|
mayue
|
4b4b04f19b
|
* Optimize code.
|
2022-03-22 15:21:34 +08:00 |
|
|
tianshujie
|
ccf11069cb
|
* Fix bug #20975.
|
2022-03-22 15:20:47 +08:00 |
|
|
孙华伟
|
0816a49ce2
|
*Fix bug#17397
|
2022-03-22 15:18:08 +08:00 |
|
|
tianshujie
|
27ee0c1d3d
|
* Fix bug #20918.
|
2022-03-22 15:15:04 +08:00 |
|
|
zenggang
|
784e153159
|
* Finish task#51115,51116,51120,51121,51133
|
2022-03-22 07:11:57 +00:00 |
|
|
李玉春
|
f7b4ea2ac6
|
Merge branch 'sprint/master_zhouxudong_16070' into 'master'
* Fix bug #16070.
See merge request easycorp/zentaopms!2443
|
2022-03-22 06:55:47 +00:00 |
|
|
zhouxudong
|
a643044137
|
* Fix bug #16070.
|
2022-03-22 14:53:08 +08:00 |
|
|
mayue
|
c86f396201
|
* Fix bug #21052.
|
2022-03-22 14:52:37 +08:00 |
|
|
zhouxin
|
30523ec374
|
Fix bug #17943.
|
2022-03-22 06:48:55 +00:00 |
|
|
tianshujie
|
69e1f67fbd
|
* Fix bug #21054.
|
2022-03-22 14:32:52 +08:00 |
|
|
liyuchun
|
b1ed52dd44
|
* Fix bug #17333.
|
2022-03-22 14:22:33 +08:00 |
|
|
liyuchun
|
166cda1186
|
* Fix bug #17235.
|
2022-03-22 14:12:44 +08:00 |
|
|
tianshujie
|
56c777f843
|
* Fix bug #17668.
|
2022-03-22 14:10:13 +08:00 |
|
|
朱金勇
|
f523d8f121
|
Merge branch 'sgm_storytest' into 'master'
* Add story test and fix bug.
See merge request easycorp/zentaopms!2439
|
2022-03-22 06:09:37 +00:00 |
|
|
孙广明
|
fd5d14033a
|
* Add story test and fix bug.
|
2022-03-22 14:07:42 +08:00 |
|
|
孙广明
|
88f1cd03d5
|
Merge branch 'fixbug_zhouxin_17415' into 'master'
Fix bug #17415.
See merge request easycorp/zentaopms!2436
|
2022-03-22 06:06:31 +00:00 |
|
|
mayue
|
c09b24adbd
|
* Fix bug #20098.
|
2022-03-22 13:50:19 +08:00 |
|
|
李玉春
|
2b1fee6181
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2433
|
2022-03-22 05:43:55 +00:00 |
|
|
tianshujie
|
129c55db39
|
* Delete useless judgment conditions.
|
2022-03-22 13:40:43 +08:00 |
|
|
caoyanyi
|
515de66bdc
|
* Adjust code.
|
2022-03-22 13:40:23 +08:00 |
|