 tianshujie
|
0cb1e7ffd3
|
Merge branch 'sprint/208_tianshujie_58554' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/208_tianshujie_58554
|
2022-06-28 17:55:53 +08:00 |
|
|
tianshujie
|
12fd7102a1
|
* Finish task #58556.
|
2022-06-28 17:55:19 +08:00 |
|
|
liumengyi
|
b0df9d23de
|
* Finish task #58557.
|
2022-06-28 17:50:37 +08:00 |
|
|
tianshujie
|
6fb8d56c65
|
* Finish task #58556.
|
2022-06-28 17:09:04 +08:00 |
|
|
tianshujie
|
621e382cb6
|
* Finish task #58554.
|
2022-06-28 15:35:49 +08:00 |
|
|
王怡栋
|
2875e33357
|
Merge branch 'sprint/208_liumengyi_58553' into 'master'
* Finish task #58561.
See merge request easycorp/zentaopms!4179
|
2022-06-28 03:52:02 +00:00 |
|
|
王怡栋
|
a1bb9ddb11
|
Merge branch 'master_xieqiyu_58587' into 'master'
Master xieqiyu 58587
See merge request easycorp/zentaopms!4176
|
2022-06-28 03:30:09 +00:00 |
|
|
王怡栋
|
742d791e63
|
Merge branch 'sprint/master_zhouxudong_24410' into 'master'
* Fix bug #24410.
See merge request easycorp/zentaopms!4173
|
2022-06-28 03:28:51 +00:00 |
|
|
王怡栋
|
3782093a72
|
Merge branch 'master_xieqiyu_58592' into 'master'
* Finish task#58592.
See merge request easycorp/zentaopms!4171
|
2022-06-28 03:28:34 +00:00 |
|
|
王怡栋
|
1c45032e88
|
Merge branch 'sprint/208_tianshujie_58560' into 'master'
* Finish task #58560.
See merge request easycorp/zentaopms!4174
|
2022-06-28 03:28:15 +00:00 |
|
|
tianshujie
|
1cacd32453
|
* Finish task #58560.
|
2022-06-28 11:27:15 +08:00 |
|
|
tianshujie
|
3a380aee1d
|
* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.
|
2022-06-28 11:23:20 +08:00 |
|
|
liumengyi
|
3dda133a92
|
* Finish task #58561.
|
2022-06-28 11:08:30 +08:00 |
|
|
tianshujie
|
6be5803453
|
* Delete extra blank lines.
|
2022-06-28 10:43:33 +08:00 |
|
|
xieqiyu
|
0bea0164e6
|
* Finish task#58587.
|
2022-06-28 10:40:23 +08:00 |
|
|
xieqiyu
|
90a15fcdb1
|
* Finish task#58587.
|
2022-06-28 10:26:22 +08:00 |
|
|
zhouxudong
|
966b965692
|
* Fix bug #24410.
|
2022-06-28 02:12:30 +00:00 |
|
|
王怡栋
|
ba2ad55733
|
Merge branch 'sprint/209_hufangzhou_58573' into 'master'
* Finish task #58573.
See merge request easycorp/zentaopms!4170
|
2022-06-28 01:52:23 +00:00 |
|
|
王怡栋
|
b64a75c569
|
Merge branch 'sgm_fixbug' into 'master'
* Finish task #59081.
See merge request easycorp/zentaopms!4168
|
2022-06-28 01:52:00 +00:00 |
|
|
hufangzhou
|
9a1156054e
|
* Finish task #58573.
|
2022-06-28 09:49:46 +08:00 |
|
|
xieqiyu
|
b55f45be0f
|
* Finish task#58592.
|
2022-06-28 09:49:22 +08:00 |
|
|
孙广明
|
c3cf1eab05
|
* Add de/fr lang.
|
2022-06-28 09:45:47 +08:00 |
|
|
王怡栋
|
2f837a3970
|
Merge branch 'sprint209_leiyong_task_58598' into 'master'
Sprint209 leiyong task 58598
See merge request easycorp/zentaopms!4167
|
2022-06-28 01:42:06 +00:00 |
|
|
王怡栋
|
e936b42283
|
Merge branch 'sgm_fixbug' into 'master'
* Fix product order bug.
See merge request easycorp/zentaopms!4165
|
2022-06-28 01:28:24 +00:00 |
|
|
孙广明
|
f3d496d7fe
|
更新module/product/control.php
|
2022-06-28 01:27:25 +00:00 |
|
|
王怡栋
|
2a940ec8ce
|
Merge branch 'sprint/master_zhouxudong_58575' into 'master'
Sprint/master zhouxudong 58575
See merge request easycorp/zentaopms!4162
|
2022-06-28 01:26:48 +00:00 |
|
|
zhouxudong
|
be59d6249b
|
* Finish task #58575.
|
2022-06-28 01:25:06 +00:00 |
|
|
孙广明
|
bc47df0018
|
* Finish task #59081.
|
2022-06-28 09:23:27 +08:00 |
|
|
王怡栋
|
9734ebdb4e
|
Merge branch 'master_xieqiyu_24304' into 'master'
* Fix bug#24304.
See merge request easycorp/zentaopms!4164
|
2022-06-28 01:18:58 +00:00 |
|
|
zhouxudong
|
6e2b3acd80
|
* Finish task #58575.
|
2022-06-28 01:08:01 +00:00 |
|
|
王怡栋
|
2a82c6a6a1
|
Merge branch 'sprint/master_zhouxudong_58576' into 'master'
Sprint/master zhouxudong 58576
See merge request easycorp/zentaopms!4163
|
2022-06-28 01:05:10 +00:00 |
|
|
xieqiyu
|
ff2a952493
|
* Fix bug#24304.
|
2022-06-28 09:03:40 +08:00 |
|
|
zhouxudong
|
72200617d3
|
* Finish task #58576.
|
2022-06-28 00:57:01 +00:00 |
|
|
zhouxudong
|
d8acac2813
|
* Finish task #58575 #58602.
|
2022-06-28 00:49:54 +00:00 |
|
|
王怡栋
|
d84d8cac4a
|
Merge branch 'master_xieqiyu_58585' into 'master'
* Finish task#58585.
See merge request easycorp/zentaopms!4159
|
2022-06-28 00:26:01 +00:00 |
|
|
王怡栋
|
4f90ce5f08
|
Merge branch 'sprint/206_tianshujie_23955' into 'master'
Sprint/206 tianshujie 23955
See merge request easycorp/zentaopms!4148
|
2022-06-28 00:24:31 +00:00 |
|
|
孙广明
|
da315c7aaf
|
* Fix product order bug.
|
2022-06-28 08:15:51 +08:00 |
|
|
xieqiyu
|
f7b01e1a0e
|
* Finish task#58585.
|
2022-06-28 08:14:06 +08:00 |
|
|
leiyong
|
808d67b879
|
* Adjust code.
|
2022-06-27 10:32:20 +00:00 |
|
|
孙广明
|
fbf36ea3e6
|
Merge branch 'master_xieqiyu_57854' into 'master'
* Modify language item.
See merge request easycorp/zentaopms!4158
|
2022-06-27 09:32:04 +00:00 |
|
|
孙广明
|
3bfc3a9f31
|
Merge branch 'sprint/209_hufangzhou_58563' into 'master'
* Finish task #58563.
See merge request easycorp/zentaopms!4153
|
2022-06-27 09:31:53 +00:00 |
|
|
xieqiyu
|
132433cc92
|
* Modify language item.
|
2022-06-27 17:27:15 +08:00 |
|
|
孙广明
|
209b13aafb
|
Merge branch 'fixbug' into 'master'
* Fix bug #24340.
See merge request easycorp/zentaopms!4154
|
2022-06-27 09:20:50 +00:00 |
|
|
孙广明
|
53ce8a4560
|
Merge branch 'master_xieqiyu_57854' into 'master'
Master xieqiyu 57854
See merge request easycorp/zentaopms!4157
|
2022-06-27 09:19:58 +00:00 |
|
|
孙广明
|
342214a5ad
|
Merge branch 'master_xieqiyu_58591' into 'master'
* Finish task#58591.
See merge request easycorp/zentaopms!4147
|
2022-06-27 09:16:56 +00:00 |
|
|
zhouxudong
|
eaa39c7f0f
|
* Finish task #58576 #58577.
|
2022-06-27 09:14:37 +00:00 |
|
|
xieqiyu
|
9b1c865964
|
* Code for task#57854.
|
2022-06-27 17:11:59 +08:00 |
|
|
孙广明
|
85ac450243
|
Merge branch 'sprint/207_mayue_bug#24049' into 'master'
* Fix bug #24049.
See merge request easycorp/zentaopms!4155
|
2022-06-27 08:54:19 +00:00 |
|
|
xieqiyu
|
8dd618528a
|
* Fix test bug.
|
2022-06-27 16:51:53 +08:00 |
|
|
tanghucheng
|
a8834418f1
|
* Fix bug #24340.
|
2022-06-27 16:50:39 +08:00 |
|