 王怡栋
|
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 |
|
|
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 |
|
|
孙广明
|
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 |
|
|
王怡栋
|
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 |
|
|
王怡栋
|
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 |
|
|
tianshujie
|
49ecf0795c
|
* Finish task #58554.
|
2022-07-04 14:57:07 +08:00 |
|
|
王怡栋
|
1a82574947
|
Merge branch 'sprint/master_zhouxudong_22964' into 'master'
Sprint/master zhouxudong 22964
See merge request easycorp/zentaopms!4315
|
2022-07-04 06:56:52 +00:00 |
|
|
王怡栋
|
a5a8d418a0
|
Merge branch 'sprint/master_zhouxudong_24681' into 'master'
* Fix bug #24681.
See merge request easycorp/zentaopms!4311
|
2022-07-04 06:56:21 +00:00 |
|
|
caoyanyi
|
018ba38397
|
* Finish task #59441,59442,59443,59444,59445.
|
2022-07-04 14:53:16 +08:00 |
|
|
tianshujie
|
6fc6d25a48
|
* Finish task #58554.
|
2022-07-04 14:48:24 +08:00 |
|
|
liumengyi
|
6138501ff7
|
* Finish task #59479.
|
2022-07-04 14:35:05 +08:00 |
|
|
wangyidong
|
236243284a
|
* unlink files.
|
2022-07-04 14:16:52 +08:00 |
|
|
wangyidong
|
c88aa6b8f1
|
Merge branch 'zentaomax35'
|
2022-07-04 14:16:06 +08:00 |
|
|
tianshujie
|
31ea99dae1
|
* Finish task #58556.
|
2022-07-04 14:12:48 +08:00 |
|
|
tianshujie
|
3e19862ed1
|
* Finish task #58554.
|
2022-07-04 14:12:36 +08:00 |
|
|
zhouxudong
|
6b960dc038
|
* Finish task #59542 #59541.
|
2022-07-04 05:57:34 +00:00 |
|
|
李玉春
|
9a8e678bff
|
Merge branch 'zenops_37' into 'master'
Zenops 37
See merge request easycorp/zentaopms!4314
|
2022-07-04 05:41:24 +00:00 |
|
|
tianshujie
|
fedefaf02b
|
* Finish task #58554.
|
2022-07-04 13:20:33 +08:00 |
|
|
tianshujie
|
ee701c75c9
|
* Finish task #58554.
|
2022-07-04 13:20:09 +08:00 |
|
|
liumengyi
|
89f5ead39c
|
* Modify French language items.
|
2022-07-04 11:28:49 +08:00 |
|
|
liumengyi
|
7f9f5f662c
|
* Finish task #59468.
|
2022-07-04 11:21:56 +08:00 |
|
|
李玉春
|
01f6be9b57
|
Merge branch 'cyy_tab' into 'zenops_37'
* Modify tab menu.
See merge request easycorp/zentaopms!4313
|
2022-07-04 03:03:51 +00:00 |
|
|
caoyanyi
|
30850025f5
|
* Modify tab menu.
|
2022-07-04 10:44:06 +08:00 |
|
|
zhouxudong
|
2b644837a0
|
* Fix bug #23596.
|
2022-07-04 00:30:07 +00:00 |
|
|
zhouxudong
|
7e612e94c6
|
* Fix bug #24681.
|
2022-07-04 00:17:43 +00:00 |
|
|
tianshujie
|
31dda1ebb8
|
* Fix bug #24686.
|
2022-07-04 08:16:34 +08:00 |
|
|
王怡栋
|
f1a7448b71
|
Merge branch 'sprint/wangzemei/bug24134' into 'master'
* Fix bug24134
See merge request easycorp/zentaopms!4310
zentaopms_17.2
|
2022-07-01 09:15:14 +00:00 |
|
|
wangzemei
|
580085c24c
|
* Fix bug24134
|
2022-07-01 09:07:44 +00:00 |
|
|
zhouxudong
|
c568a46744
|
* Fix bug #22964.
|
2022-07-01 07:20:01 +00:00 |
|