 liumengyi
|
aa0a763a17
|
* Finish task #58559.
|
2022-06-28 13:56:52 +08:00 |
|
|
liumengyi
|
2379f0e4a4
|
* Finish task #58558, #58559.
|
2022-06-28 13:22:23 +08:00 |
|
|
王怡栋
|
1c081420c9
|
Merge branch 'fixbug' into 'master'
* Fix bug .
See merge request easycorp/zentaopms!4175
|
2022-06-28 02:52:38 +00:00 |
|
|
tanghucheng
|
0a9f2056ee
|
* Fix bug .
|
2022-06-28 10:47:25 +08:00 |
|
|
朱金勇
|
921f8a0950
|
Merge branch 'sprint/sunhao/picker' into 'master'
* change default option for picker.
See merge request easycorp/zentaopms!4169
|
2022-06-28 01:54:52 +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 |
|
|
Hao Sun
|
83c7f37ed4
|
* change default option for picker.
|
2022-06-28 01:48:23 +00: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 |
|
|
孙广明
|
58f7fb77dd
|
Merge branch 'sprint/209_hufangzhou_24385' into 'master'
* Fix bug #24385.
See merge request easycorp/zentaopms!4156
|
2022-06-28 01:24:08 +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 |
|
|
王怡栋
|
47b496c2ad
|
Merge branch 'sprint/workflow' into 'master'
* Add approval field to zt_workflow.
See merge request easycorp/zentaopms!4161
|
2022-06-28 00:47:03 +00:00 |
|
|
王怡栋
|
a1228db231
|
Merge branch 'fixbug' into 'master'
* Fix bug for lite.
See merge request easycorp/zentaopms!4160
|
2022-06-28 00:45:56 +00:00 |
|
|
wangyuting2
|
e8dbad3b19
|
* Add approval field to zt_workflow.
|
2022-06-28 08:33:59 +08:00 |
|
|
tanghucheng
|
6c923d96cb
|
* Fix bug for lite.
|
2022-06-28 08:30:45 +08: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 |
|
|
hufangzhou
|
a1825d59d8
|
* Fix bug #24385.
|
2022-06-27 17:09:48 +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 |
|
|
leiyong
|
f8087acd1d
|
* Finish task#58598.
|
2022-06-27 08:49:52 +00:00 |
|
|
leiyong
|
a2fe525436
|
* Finish task#58598.
|
2022-06-27 08:49:35 +00:00 |
|
|
zhouxudong
|
6314aad2e3
|
* Finish task #58575 #58602.
|
2022-06-27 08:38:11 +00:00 |
|
|
hufangzhou
|
b98e169fa4
|
* Finish task #58563.
|
2022-06-27 16:33:32 +08:00 |
|
|
zhouxudong
|
446ec44f29
|
* Finish task #58576 #58577.
|
2022-06-27 07:36:13 +00:00 |
|
|
王怡栋
|
ff3052113a
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug #24368.
See merge request easycorp/zentaopms!4146
|
2022-06-27 06:58:04 +00:00 |
|