 hufangzhou
|
8b8b4f6989
|
* Fix bug #16207.
|
2022-03-23 09:58:09 +08:00 |
|
|
孙广明
|
0c79df3fb6
|
Merge branch 'wyd_fixbug' into 'master'
Wyd fixbug
See merge request easycorp/zentaopms!2461
|
2022-03-23 00:53:36 +00:00 |
|
|
王怡栋
|
a18d75137f
|
Merge branch 'sprint/lite6_lwr_task_batch_create_hide_region' into 'master'
* optimize lane loading for task batchcreate, and remove region and lane...
See merge request easycorp/zentaopms!2452
|
2022-03-23 00:48:46 +00:00 |
|
|
王怡栋
|
de9ababa43
|
Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix bug #19816
See merge request easycorp/zentaopms!2449
|
2022-03-23 00:47:55 +00:00 |
|
|
王怡栋
|
707f85bb13
|
Merge branch 'fixbug' into 'master'
* Fix bug #51313,20782.
See merge request easycorp/zentaopms!2455
|
2022-03-23 00:47:28 +00:00 |
|
|
孙广明
|
dea5f09087
|
Merge branch 'fixbug_zhouxin_15517' into 'master'
* Fix bug #15517.
See merge request easycorp/zentaopms!2460
|
2022-03-22 09:26:27 +00:00 |
|
|
zhouxin
|
8d17a390c0
|
* Fix bug #15517.
|
2022-03-22 09:23:21 +00:00 |
|
|
孙广明
|
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 |
|
|
孙广明
|
9e75ac5fcc
|
Merge branch 'autotest_ly' into 'master'
Autotest ly
See merge request easycorp/zentaopms!2459
|
2022-03-22 09:13:00 +00:00 |
|
|
liyang
|
ad24792c5f
|
update project data
|
2022-03-22 17:10:32 +08:00 |
|
|
朱金勇
|
f04583c827
|
Merge branch 'app_zhengrunyu' into 'master'
*Fix api for user.
See merge request easycorp/zentaopms!2457
|
2022-03-22 08:58:25 +00:00 |
|
|
zhengrunyu
|
896b9c9b38
|
*Add blank.
|
2022-03-22 16:55:59 +08: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 |
|
|
zhengrunyu
|
5711890a9c
|
*Fix api for user.
|
2022-03-22 16:52:40 +08: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 |
|
|
tanghucheng
|
b2a51a11f7
|
* Fix bug #51313,20782.
|
2022-03-22 16:25:41 +08:00 |
|
|
zhengrunyu
|
99e9f49a7a
|
*Fix api for user.
|
2022-03-22 16:24:41 +08: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 |
|
|
Wenrui LI
|
8daa277602
|
* optimize lane loading for task batchcreate, and remove region and lane setting if only one of each available, task #51308.
|
2022-03-22 16:07:42 +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 |
|
|
Zongjun Lan
|
351de43038
|
* fix bug #19816
|
2022-03-22 15:41:26 +08: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 |
|
|
朱金勇
|
297a9969dc
|
Merge branch 'sprint/scx_api' into 'master'
*Task batchCreate API.
See merge request easycorp/zentaopms!2420
|
2022-03-22 07:38:53 +00:00 |
|
|
zhouxin
|
cebd0a33d5
|
Fix bug #13855.
|
2022-03-22 07:38:24 +00:00 |
|
|
朱金勇
|
743f6b685a
|
Merge branch 'sprint/scx_estimate' into 'master'
*Get task estimates.;
See merge request easycorp/zentaopms!2441
|
2022-03-22 07:38:04 +00:00 |
|
|
songchenxuan
|
af7aa5422e
|
*Code format.
|
2022-03-22 15:36:29 +08:00 |
|
|
zenggang
|
04652c0e65
|
* Adjust code
|
2022-03-22 07:34:17 +00:00 |
|
|
songchenxuan
|
6d9a115f6f
|
*Code format.
|
2022-03-22 15:29:25 +08:00 |
|
|
孙华伟
|
fb6de8f7e6
|
*Optimize the code.
|
2022-03-22 15:27:36 +08:00 |
|