 leiyong
|
f888f66bf5
|
* Finish task#58578.
|
2022-06-28 09:59:34 +00:00 |
|
|
王怡栋
|
708f4ed932
|
Merge branch 'spritn209_leiyong_adjust_css' into 'master'
* Adjust CSS.
See merge request easycorp/zentaopms!4182
|
2022-06-28 06:03:47 +00:00 |
|
|
朱金勇
|
0766e36e20
|
Merge branch 'sprint/scx_api' into 'master'
* Update api.
See merge request easycorp/zentaopms!4185
|
2022-06-28 05:57:43 +00:00 |
|
|
leiyong
|
f8c67aabc1
|
* Adjust the indent.
|
2022-06-28 05:57:18 +00:00 |
|
|
宋辰轩
|
afdde557fc
|
* Update api.
|
2022-06-28 13:51:10 +08:00 |
|
|
leiyong
|
1d0bc1e818
|
* Finish task#58597.
|
2022-06-28 05:49:51 +00:00 |
|
|
王怡栋
|
f7ab50da63
|
Merge branch 'master_xieqiyu_58584' into 'master'
* Finish task#58584.
See merge request easycorp/zentaopms!4183
|
2022-06-28 05:48:34 +00:00 |
|
|
xieqiyu
|
320c88d44d
|
* Finish task#58584.
|
2022-06-28 13:30:51 +08:00 |
|
|
leiyong
|
a5b4a79ea8
|
* Adjust code.
|
2022-06-28 05:26:37 +00:00 |
|
|
王怡栋
|
c0336de284
|
Merge branch 'sprint/209_hufangzhou_58569' into 'master'
* Finish task #58569.
See merge request easycorp/zentaopms!4181
|
2022-06-28 05:09:23 +00:00 |
|
|
wangyidong
|
9215c4f814
|
Merge branch 'sprint/208_liumengyi_58561'
|
2022-06-28 13:08:39 +08:00 |
|
|
王怡栋
|
956c806cf9
|
Merge branch 'master' into 'sprint/208_liumengyi_58561'
# Conflicts:
# db/update17.1.sql
|
2022-06-28 05:08:18 +00:00 |
|
|
liumengyi
|
cd3956ad1c
|
* Optimize code.
|
2022-06-28 13:06:38 +08:00 |
|
|
hufangzhou
|
91bc9e3327
|
* Finish task #58569.
|
2022-06-28 13:05:48 +08:00 |
|
|
孙广明
|
14e591f05e
|
Merge branch 'sprint209_leiyong_task_58579'
|
2022-06-28 13:05:35 +08:00 |
|
|
孙广明
|
14fa8cd30d
|
Merge branch 'master' into 'sprint209_leiyong_task_58579'
# Conflicts:
# module/my/css/task.css
|
2022-06-28 05:05:19 +00:00 |
|
|
liumengyi
|
ca6332efaa
|
* Optimize code.
|
2022-06-28 13:04:44 +08:00 |
|
|
孙广明
|
0c1c8ab16d
|
Merge branch 'sprint/210_mayue_bug#24408' into 'master'
* Fix bug #24408.
See merge request easycorp/zentaopms!4172
|
2022-06-28 05:04:23 +00:00 |
|
|
liumengyi
|
d08f95c0fa
|
* Optimize code.
|
2022-06-28 12:24:21 +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 |
|
|
王怡栋
|
394216babf
|
Merge branch 'master_xieqiyu_58603' into 'master'
* Finish task#58603.
See merge request easycorp/zentaopms!4178
|
2022-06-28 03:30:36 +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 |
|
|
xieqiyu
|
f617a45203
|
* Finish task#58603.
|
2022-06-28 11:25: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 |
|
|
leiyong
|
0e0d3be73c
|
* Finish task#58570.
|
2022-06-28 03:21:23 +00:00 |
|
|
liumengyi
|
3dda133a92
|
* Finish task #58561.
|
2022-06-28 11:08:30 +08:00 |
|
|
王怡栋
|
1c081420c9
|
Merge branch 'fixbug' into 'master'
* Fix bug .
See merge request easycorp/zentaopms!4175
|
2022-06-28 02:52:38 +00:00 |
|
|
liumengyi
|
16d62b8a6e
|
* Finish task #58562.
|
2022-06-28 10:48:25 +08:00 |
|
|
tanghucheng
|
0a9f2056ee
|
* Fix bug .
|
2022-06-28 10:47:25 +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 |
|
|
liumengyi
|
cca9efbb77
|
* Finish task #58561.
|
2022-06-28 10:33:05 +08:00 |
|
|
xieqiyu
|
90a15fcdb1
|
* Finish task#58587.
|
2022-06-28 10:26:22 +08:00 |
|
|
mayue
|
c860a20edf
|
* Fix bug #24408.
|
2022-06-28 10:15:36 +08:00 |
|
|
zhouxudong
|
966b965692
|
* Fix bug #24410.
|
2022-06-28 02:12:30 +00: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 |
|
|
xieqiyu
|
b55f45be0f
|
* Finish task#58592.
|
2022-06-28 09:49:22 +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 |
|