 孙广明
|
6873b1061f
|
Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304
See merge request easycorp/zentaopms!2007
|
2022-03-01 07:04:26 +00:00 |
|
|
xieqiyu
|
d4211b3f56
|
* Fix bug.
|
2022-03-01 14:58:32 +08:00 |
|
|
xieqiyu
|
74326a3331
|
* Optimize the code.
|
2022-03-01 14:40:00 +08:00 |
|
|
李玉春
|
f84fbf19c9
|
Merge branch 'sprint/pailei_mayue_bug20175' into 'pailei'
* Fix bug#20175.
See merge request easycorp/zentaopms!2025
|
2022-03-01 06:23:03 +00:00 |
|
|
mayue
|
8fe8034cf4
|
* Fix bug#20175.
|
2022-03-01 14:15:21 +08:00 |
|
|
王怡栋
|
80ffe8f352
|
* adjust for check priv.
|
2022-03-01 11:01:39 +08:00 |
|
|
王怡栋
|
0e85a489c3
|
Merge branch 'pailei' of https://gitlab.zcorp.cc/easycorp/zentaopms into pailei
|
2022-03-01 10:29:15 +08:00 |
|
|
王怡栋
|
dad7a8236a
|
* adjust for task #49362.
|
2022-03-01 10:28:53 +08:00 |
|
|
孙广明
|
1498d798d4
|
Merge branch 'sprint/pailei_zhouxin_49883' into 'pailei'
Finish task #49886#49883.
See merge request easycorp/zentaopms!2017
|
2022-03-01 01:07:15 +00:00 |
|
|
王怡栋
|
5ee1c3e5e3
|
* code for paste image.
|
2022-03-01 08:54:27 +08:00 |
|
|
李玉春
|
2dac4c550e
|
Merge branch 'sprint/185_mayue_task49885' into 'pailei'
* Finish task #49885.
See merge request easycorp/zentaopms!2014
|
2022-03-01 00:23:14 +00:00 |
|
|
xieqiyu
|
af76bc5b46
|
* Append story module when change product type.
|
2022-02-28 17:50:06 +08:00 |
|
|
孙广明
|
12721702c2
|
Merge branch 'pailei_zhangzilong_49297' into 'pailei'
* Finish task #49297.
See merge request easycorp/zentaopms!2009
|
2022-02-28 09:22:33 +00:00 |
|
|
zhouxin
|
5dc91f9a30
|
Finish task #49886#49883.
|
2022-02-28 09:14:19 +00:00 |
|
|
xieqiyu
|
5cd1872e93
|
* Modify edit bug and batch edit bug.
|
2022-02-28 17:04:12 +08:00 |
|
|
李玉春
|
e78cba2283
|
Merge branch 'remotes/origin/sprint/185_zhengrunyu_49294' into 'pailei'
* Finish task 49294 .
See merge request easycorp/zentaopms!2013
|
2022-02-28 07:57:28 +00:00 |
|
|
zhengrunyu
|
62699ca48d
|
* Finish task 49294 .
|
2022-02-28 15:51:59 +08:00 |
|
|
zhangzilong
|
b4176af440
|
* Finish task #49297.
|
2022-02-28 15:31:43 +08:00 |
|
|
mayue
|
ae867e8351
|
* Finish task #49885.
|
2022-02-28 14:36:30 +08:00 |
|
|
zhangzilong
|
e30a8b1343
|
* Finish task #49297.
|
2022-02-28 14:27:55 +08:00 |
|
|
xieqiyu
|
5f6c2bec3b
|
* Delete unused code.
|
2022-02-28 10:44:41 +08:00 |
|
|
xieqiyu
|
9024dae71e
|
* Modify linked products when edit product.
|
2022-02-28 10:15:16 +08:00 |
|
|
孙广明
|
df55b0af1b
|
Merge branch '185'
|
2022-02-28 08:58:20 +08:00 |
|
|
王怡栋
|
f3f91716c6
|
Merge branch 'sgm_upgrade' into 'sprint/185'
* Fix upgrade bug.
See merge request easycorp/zentaopms!1992
|
2022-02-28 00:49:56 +00:00 |
|
|
孙广明
|
ec16236bb5
|
* Fix upgrade bug.
|
2022-02-28 08:45:04 +08:00 |
|
|
zhujinyong
|
3f7ff4ee25
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185
|
2022-02-25 17:37:29 +08:00 |
|
|
zhujinyong
|
08ea97263f
|
* Fix hook files of xuan.
|
2022-02-25 17:37:10 +08:00 |
|
|
王怡栋
|
115d80f557
|
Merge branch 'sgm_fixbug' into sprint/185
|
2022-02-25 17:22:04 +08:00 |
|
|
王怡栋
|
c7d26de7bf
|
Merge branch 'sprint/185' into 'sgm_fixbug'
# Conflicts:
# framework/base/router.class.php
|
2022-02-25 09:20:48 +00:00 |
|
|
王怡栋
|
22226d962f
|
Merge branch 'sprint/185_lanzongjun_49380' into 'sprint/185'
* fix task 49380
See merge request easycorp/zentaopms!1987
|
2022-02-25 09:18:53 +00:00 |
|
|
孙广明
|
5ff5699d91
|
* Fix bug.
|
2022-02-25 17:11:58 +08:00 |
|
|
朱金勇
|
6c6c819775
|
Merge branch 'sprint/186_hufangzhou_zentaoxx' into 'sprint/185'
* Need not move the web directory.
See merge request easycorp/zentaopms!1986
|
2022-02-25 08:29:38 +00:00 |
|
|
hufangzhou
|
55bff72996
|
* Adjust the makefile.
|
2022-02-25 16:28:18 +08:00 |
|
|
zhujinyong
|
d0a4e2af68
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185
|
2022-02-25 16:19:51 +08:00 |
|
|
zhujinyong
|
8eae5ebf65
|
* FIx import path.
|
2022-02-25 16:18:07 +08:00 |
|
|
Zongjun Lan
|
fee7b73ffe
|
* fix task 49380
|
2022-02-25 16:17:04 +08:00 |
|
|
hufangzhou
|
f26df2d7a9
|
* Need not move the web directory.
|
2022-02-25 16:16:03 +08:00 |
|
|
孙广明
|
6b644b8c26
|
Merge branch 'sprint/186_liumengyi_19924' into 'sprint/185'
* FIx bug #19924.
See merge request easycorp/zentaopms!1985
|
2022-02-25 08:10:43 +00:00 |
|
|
liumengyi
|
51ef04f29c
|
* FIx bug #19924.
|
2022-02-25 15:58:26 +08:00 |
|
|
王怡栋
|
549f3d20e1
|
Merge branch 'sgm_fixbug' into 'sprint/185'
* Fix bug.
See merge request easycorp/zentaopms!1984
|
2022-02-25 07:42:19 +00:00 |
|
|
孙广明
|
c1ebe28837
|
* Fix bug.
|
2022-02-25 15:39:08 +08:00 |
|
|
孙广明
|
09028b789e
|
Merge branch 'sprint/186_hufangzhou_makefile' into 'sprint/185'
* Can not use vision field of zt_action table when upgrade.
See merge request easycorp/zentaopms!1983
|
2022-02-25 07:30:41 +00:00 |
|
|
hufangzhou
|
9640120b43
|
* Can not use vision field of zt_action table when upgrade.
|
2022-02-25 15:28:15 +08:00 |
|
|
zhujinyong
|
762c60d0d0
|
* Fix extLangPath.
|
2022-02-25 15:17:53 +08:00 |
|
|
zhujinyong
|
a33ba80fb4
|
* Adjust language of router.
|
2022-02-25 14:58:58 +08:00 |
|
|
孙广明
|
3627387370
|
Merge branch 'sprint/185_mayue_49285' into 'sprint/185'
* Finish task#49285.
See merge request easycorp/zentaopms!1871
|
2022-02-25 06:32:20 +00:00 |
|
|
mayue
|
37a9564c95
|
* Optimize code.
|
2022-02-25 14:20:37 +08:00 |
|
|
mayue
|
c3ef97bf47
|
* Optimize code.
|
2022-02-25 14:15:25 +08:00 |
|
|
mayue
|
245542e972
|
* Optimize code.
|
2022-02-25 14:00:54 +08:00 |
|
|
王怡栋
|
4f4144b72f
|
Merge branch 'sprint/185_tanghucheng_fixbug' into 'sprint/185'
* Fix bug #19898,20028.
See merge request easycorp/zentaopms!1981
|
2022-02-25 05:45:43 +00:00 |
|