 guofeilong
|
4d16cbf4dc
|
* fix indentation problem
|
2022-07-05 07:23:36 +00:00 |
|
|
guofeilong
|
45ba655887
|
* Finish task #59703
|
2022-07-05 06:28:11 +00:00 |
|
|
王怡栋
|
7a01041c35
|
Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59545,#59546. Update lane name.
See merge request easycorp/zentaopms!4334
|
2022-07-05 02:45:38 +00:00 |
|
|
王怡栋
|
e28ac4526d
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Finish task #59641.
See merge request easycorp/zentaopms!4328
|
2022-07-05 02:45:04 +00:00 |
|
|
王怡栋
|
646d720201
|
Merge branch 'sprint/zui_guofeilong_min.css' into 'master'
* rollback pointer-events none out table
See merge request easycorp/zentaopms!4333
|
2022-07-05 02:43:41 +00:00 |
|
|
xieqiyu
|
704711ce6f
|
* Code for task#59545,#59546. Update lane name.
|
2022-07-05 10:32:39 +08:00 |
|
|
孙广明
|
0555f59112
|
Merge branch 'zg_bug_24689' into 'master'
* Fix bug #24689
See merge request easycorp/zentaopms!4323
|
2022-07-05 02:16:07 +00:00 |
|
|
孙广明
|
bae83de408
|
Merge branch 'sprint/213_mayue_task#59700' into 'master'
* Optimize code for task#59700.
See merge request easycorp/zentaopms!4332
|
2022-07-05 02:15:50 +00:00 |
|
|
mayue
|
637f81c00e
|
* Optimize code for task#59700.
|
2022-07-05 10:13:53 +08:00 |
|
|
王怡栋
|
38bd35f650
|
Merge branch 'sprint/212_hufangzhou_59538' into 'master'
* Finish task #59538.
See merge request easycorp/zentaopms!4330
|
2022-07-05 02:10:23 +00:00 |
|
|
王怡栋
|
bbf8176034
|
Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59544,#59546. Add update region when delete lane.
See merge request easycorp/zentaopms!4329
|
2022-07-05 02:10:12 +00:00 |
|
|
王怡栋
|
71ab49c34e
|
Merge branch 'sprint/master_zhouxudong_59529' into 'master'
* Finish task #59534 #59530 #59529.
See merge request easycorp/zentaopms!4325
|
2022-07-05 02:09:08 +00:00 |
|
|
王怡栋
|
28bea206d8
|
Merge branch 'fixbug' into 'master'
* Fix bug #24708.
See merge request easycorp/zentaopms!4322
|
2022-07-05 02:08:30 +00:00 |
|
|
王怡栋
|
a6916a73c5
|
Merge branch 'sprint/master_zhouxudong_59527' into 'master'
Sprint/master zhouxudong 59527
See merge request easycorp/zentaopms!4326
|
2022-07-05 02:07:26 +00:00 |
|
|
liuruogu
|
e82585d3d7
|
* Finish task #59641.
|
2022-07-05 02:06:59 +00:00 |
|
|
hufangzhou
|
52bbc84bb4
|
* Finish task #59538.
|
2022-07-05 10:06:06 +08:00 |
|
|
guofeilong
|
3593dc29fe
|
* rollback pointer-events none out table
|
2022-07-05 02:03:39 +00:00 |
|
|
王怡栋
|
db007fe5eb
|
Merge branch 'sprint/211_tianshujie_59472' into 'master'
Sprint/211 tianshujie 59472
See merge request easycorp/zentaopms!4327
|
2022-07-05 01:54:17 +00:00 |
|
|
tianshujie
|
87160bf3a5
|
* Fix bug #24718.
|
2022-07-05 09:53:43 +08:00 |
|
|
tianshujie
|
63834e128c
|
* Fix bug #24718.
|
2022-07-05 09:52:13 +08:00 |
|
|
tianshujie
|
0da2ce9dd3
|
* Finish task #59975.
|
2022-07-05 09:46:34 +08:00 |
|
|
liuruogu
|
80a7f810d6
|
* Finish task #59641.
|
2022-07-05 01:39:38 +00:00 |
|
|
xieqiyu
|
c58e61ed26
|
* Code for task#59544,#59546. Add update region when delete lane.
|
2022-07-05 09:26:18 +08:00 |
|
|
tianshujie
|
17a8e9dcd5
|
* Changing the name of a function.
|
2022-07-05 08:47:45 +08:00 |
|
|
tianshujie
|
de4ae73289
|
* Fix bug #24718.
|
2022-07-05 08:46:11 +08:00 |
|
|
liyuchun
|
ce96f41693
|
Merge remote-tracking branch 'origin/cyy_gitlab'
|
2022-07-05 00:45:11 +00:00 |
|
|
李玉春
|
75f251b9c3
|
Merge branch 'master' into 'cyy_gitlab'
# Conflicts:
# module/common/lang/menu.php
|
2022-07-05 00:44:06 +00:00 |
|
|
caoyanyi
|
b0897e1847
|
* Adjust codes.
|
2022-07-05 08:43:37 +08:00 |
|
|
zhouxudong
|
6003adcd19
|
* Finish task #59527.
|
2022-07-05 00:43:34 +00:00 |
|
|
孙广明
|
452a25c232
|
Merge branch 'sprint/213_mayue_task#59700' into 'master'
* Finish task #59700.
See merge request easycorp/zentaopms!4324
|
2022-07-04 09:26:58 +00:00 |
|
|
mayue
|
75a7b73c2f
|
* Optimize code.
|
2022-07-04 17:26:08 +08:00 |
|
|
孙广明
|
ceb40be97a
|
Merge branch 'liyuchun_59437' into 'master'
* Finish task #59437,59438.
See merge request easycorp/zentaopms!4320
|
2022-07-04 09:23:50 +00:00 |
|
|
mayue
|
a9773c6be0
|
* Finish task #59700.
|
2022-07-04 17:22:22 +08:00 |
|
|
tianshujie
|
21d8a543a4
|
* Fix bug #24721.
|
2022-07-04 17:20:35 +08:00 |
|
|
tianshujie
|
3028701a06
|
* Finish task #59472.
|
2022-07-04 17:18:20 +08:00 |
|
|
zenggang
|
e4af7eab3b
|
* Fix bug #24689
|
2022-07-04 09:13:46 +00:00 |
|
|
tanghucheng
|
e0964ba777
|
* Fix bug #24708.
|
2022-07-04 16:56:09 +08:00 |
|
|
zhouxudong
|
0b309f63bd
|
* Finish task #59534 #59530 #59529.
|
2022-07-04 08:54:44 +00:00 |
|
|
王怡栋
|
10db8684b3
|
Merge branch 'sprint/211_liumengyi_59479' into 'master'
* Finish task #59479.
See merge request easycorp/zentaopms!4319
|
2022-07-04 07:50:26 +00:00 |
|
|
王怡栋
|
4e1f22be8a
|
Merge branch 'sprint/212_zhouxudong_59542' into 'master'
Sprint/212 zhouxudong 59542
See merge request easycorp/zentaopms!4321
|
2022-07-04 07:50:04 +00:00 |
|
|
zhouxudong
|
5af55d653b
|
* Finish task #59542 #59541.
|
2022-07-04 07:46:30 +00:00 |
|
|
liyuchun
|
dd893ce8e1
|
* Finish task #59437,59438.
|
2022-07-04 07:36:29 +00:00 |
|
|
zhouxudong
|
1c00265c79
|
* Finish task #59527 #59572.
|
2022-07-04 07:21:39 +00:00 |
|
|
王怡栋
|
4bacc1b95f
|
Merge branch 'sprint/211_liumengyi_59468' into 'master'
* Finish task #59468.
See merge request easycorp/zentaopms!4316
|
2022-07-04 07:04:37 +00:00 |
|
|
王怡栋
|
0f932b4c64
|
Merge branch 'sprint/tianshujie_bug24686' into 'master'
* Fix bug #24686.
See merge request easycorp/zentaopms!4312
|
2022-07-04 07:03:49 +00:00 |
|
|
liumengyi
|
247458ba1e
|
* Optimize code of task #59468.
|
2022-07-04 15:03:49 +08:00 |
|
|
caoyanyi
|
ad74d90ab5
|
* Modify menu.
|
2022-07-04 15:02:02 +08:00 |
|
|
tianshujie
|
8c173c0770
|
* Fix bug #24686.
|
2022-07-04 15:01:46 +08:00 |
|
|
王怡栋
|
04b2a5994f
|
Merge branch 'sprint/208_tianshujie_58554' into 'master'
Sprint/208 tianshujie 58554
See merge request easycorp/zentaopms!4317
|
2022-07-04 06:59:21 +00:00 |
|
|
tianshujie
|
14037d612b
|
* Finish task #58554.
|
2022-07-04 14:58:56 +08:00 |
|