 yujia
|
4476c5e116
Merge branch 'erp_batchToGoods_20180117' of ssh://10.10.100.21/source/platform-b2c into erp_batchToGoods_20180117
|
8 gadi atpakaļ |
|
yujia
|
da159d35ca
调整ERP批量上架的逻辑，批量上架的库存-在售数量的库存为可上架数量
|
8 gadi atpakaļ |
|
wangdy
|
c7ef62277a
erp逻辑修改
|
8 gadi atpakaļ |
|
wangdy
|
4fa3552222
错误表格修改
|
8 gadi atpakaļ |
|
wangdy
|
a52ca79bdf
Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql
|
8 gadi atpakaļ |
|
wangdy
|
b69459a7df
产品导入切换tab时的重新加载
|
8 gadi atpakaļ |
|
hulh
|
77bcc3c2d0
Merge branch 'dev-mysql' into repeat-excel
|
8 gadi atpakaļ |
|
hulh
|
2d26bbecf5
处理导入重复的显示问题
|
8 gadi atpakaļ |
|
yangc
|
2c22ba580a
产品导入分页样式修改，未设置配送规则弹框修改
|
8 gadi atpakaļ |
|
wangdy
|
2d28eb7bb8
Merge branch 'feature_release-tomysql' into dev-mysql
|
8 gadi atpakaļ |
|
wangdy
|
7865d06012
个人物料导入错误
|
8 gadi atpakaļ |
|
hulh
|
f524fa25a7
处理匹配重复的bug
|
8 gadi atpakaļ |
|
hulh
|
84557f43d4
处理上传数据丢失的问题
|
8 gadi atpakaļ |
|
wangdy
|
dd2a47c038
erp 上传操作修改
|
8 gadi atpakaļ |
|
yangc
|
461eb0487f
去除无用代码
|
8 gadi atpakaļ |
|
yangc
|
f5e081a57f
产品管理验收跳转至
|
8 gadi atpakaļ |
|
wangdy
|
750fe7625c
Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql
|
8 gadi atpakaļ |
|
wangdy
|
3711800199
规格字段150最多
|
8 gadi atpakaļ |
|
yangc
|
4d7a7afb93
账户管理-获取验证码，校验原邮箱/手机
|
8 gadi atpakaļ |
|
yangc
|
6d085d0933
Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql
|
8 gadi atpakaļ |
|
yangc
|
c1a5f2dd2d
账户管理-验证码校验及样式修改
|
8 gadi atpakaļ |
|
yujia
|
fa50f4da13
Merge branch 'dev-mysql' into erp_batchToGoods_20180117
|
8 gadi atpakaļ |
|
yujia
|
2d1557704d
Merge branch 'dev-mysql' of ssh://10.10.100.21/source/platform-b2c into dev-mysql
|
8 gadi atpakaļ |
|
yujia
|
e3767b5ca6
商城批量上架之后重新加载数据
|
8 gadi atpakaļ |
|
yangc
|
ae383ea89f
账户管理获取验证码按钮布局调整
|
8 gadi atpakaļ |
|
yujia
|
98f27cd0d0
商城SKU对已下架的商品加入判断。
|
8 gadi atpakaļ |
|
yujia
|
7ad628aad9
Merge branch 'dev-mysql' into erp_batchToGoods_20180117
|
8 gadi atpakaļ |
|
yujia
|
fa9c9a4121
提交批量上架，已下架的商品可以重新批量上架
|
8 gadi atpakaļ |
|
yujia
|
3e24188aae
包装方式设置默认值
|
8 gadi atpakaļ |
|
wangdy
|
a7f2828e02
加唯一索引
|
8 gadi atpakaļ |
