 zhouxin
|
087916a60e
|
Fix bug #20191.
|
2022-03-02 05:49:21 +00:00 |
|
|
孙广明
|
b63fa55607
|
Merge branch 'pailei_zhangzilong_49297' into 'pailei'
* Finish task #49297.
See merge request easycorp/zentaopms!2029
|
2022-03-02 03:00:45 +00:00 |
|
|
zhangzilong
|
92f4d32a68
|
* Finish task #49297.
|
2022-03-02 10:57:48 +08:00 |
|
|
zhangzilong
|
ccc4ce9298
|
* Code for bug #49297.
|
2022-03-02 10:10:47 +08:00 |
|
|
xieqiyu
|
996992936e
|
* Change branches for batch create bug in execution.
|
2022-03-02 10:00:08 +08:00 |
|
|
xieqiyu
|
e3b101a807
|
* Fix bug of foreach.
|
2022-03-02 09:36:54 +08:00 |
|
|
zhangzilong
|
2f38d907ee
|
* Code for task #49297.
|
2022-03-02 09:07:15 +08:00 |
|
|
孙广明
|
5decf2cf6c
|
Merge branch 'sprint/185_zhouxudong_19962' into 'pailei'
* Finish task #49696.
See merge request easycorp/zentaopms!1991
|
2022-03-02 00:31:17 +00:00 |
|
|
xieqiyu
|
daefe27bf5
|
* Delete unused code.
|
2022-03-01 17:33:45 +08:00 |
|
|
xieqiyu
|
06af0ff6c4
|
* Code for task#49696.
|
2022-03-01 17:28:57 +08:00 |
|
|
孙广明
|
1f040804c0
|
Merge branch 'pailei_xieqiyu_fixbug' into 'pailei'
* Fix bug of batch edit test case.
See merge request easycorp/zentaopms!2030
|
2022-03-01 07:43:34 +00:00 |
|
|
李玉春
|
f9546ef5e7
|
Merge branch 'sprint/pailei_mayue_bug20175' into 'pailei'
* Optimize code.
See merge request easycorp/zentaopms!2028
|
2022-03-01 07:38:09 +00:00 |
|
|
xieqiyu
|
f937a6ac8f
|
* Fix bug of batch edit test case.
|
2022-03-01 15:22:07 +08:00 |
|
|
mayue
|
1d46d36aed
|
* Optimize code.
|
2022-03-01 15:09:11 +08:00 |
|
|
孙广明
|
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 |
|
|
zhangzilong
|
3b5ebbda16
|
* Finish task #49297.
|
2022-03-01 14:57:23 +08:00 |
|
|
xieqiyu
|
74326a3331
|
* Optimize the code.
|
2022-03-01 14:40:00 +08:00 |
|
|
zhangzilong
|
d8178d01eb
|
* Finish task #49297.
|
2022-03-01 14:27:16 +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 |
|
|
zhangzilong
|
aff8bf40ef
|
* Finish task #49297.
|
2022-03-01 11:19:01 +08:00 |
|
|
王怡栋
|
80ffe8f352
|
* adjust for check priv.
|
2022-03-01 11:01:39 +08:00 |
|
|
zhangzilong
|
9150e9903b
|
* Finish task #49297.
|
2022-03-01 11:00:08 +08:00 |
|
|
zhangzilong
|
1777586537
|
* Finish task #49297.
|
2022-03-01 10:59:25 +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 |
|
|
zhangzilong
|
83bf7d564a
|
* Finish task #49297.
|
2022-03-01 10:13:43 +08:00 |
|
|
zhangzilong
|
868a293324
|
*
|
2022-03-01 10:05:30 +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 |
|