 hhq
|
3cb8720e9e
Merge remote-tracking branch 'upstream/master'
|
4 years ago |
|
hhq
|
353a5467eb
新增了批次号管理；门店商品信息CRUD新增批次号，批次到期日期
|
4 years ago |
 张创标
|
2547a0f9e8
Merge branch 'master' of zcb/kmall-pt-general into master
|
4 years ago |
|
zcb
|
5398173c91
修改文件
|
4 years ago |
|
张创标
|
080cf9dedd
Merge branch 'master' of zcb/kmall-pt-general into master
|
4 years ago |
|
zcb
|
2f736afcdb
新增库对应的结构（dao、service、controller、entity、html、js）
|
4 years ago |
|
hhq
|
8f711f775a
所有商品信息显示plu，英文名称;收银端页面增加可用库存显示
|
4 years ago |
|
hhq
|
f8a66f53c0
修改管理员列表根据登录用户权限显示SQL；修改管理员列表新增表单，数据角色类型项,非admin用户隐藏添加操作员单选项
|
4 years ago |
|
hhq
|
7b18523d8a
Merge remote-tracking branch 'upstream/master'
|
4 years ago |
 Scott Chen
|
5177eedd01
Merge branch 'master' of csk/kmall-pt-general into master
|
4 years ago |
|
csk
|
d81ff565f5
过虑无效的营销方式，不在业务商用显示
|
4 years ago |
|
hhq
|
2d2bdee91f
Merge remote-tracking branch 'upstream/master'
|
4 years ago |
|
csk
|
a4d446fea7
Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general
|
4 years ago |
|
张创标
|
f87e2d5310
Merge branch 'master' of zcb/kmall-pt-general into master
|
4 years ago |
|
zcb
|
d310e8e6b8
Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general
|
4 years ago |
|
zcb
|
9aad9e8ab2
1.优惠券/满减 在CW收银端使用 （默认取优惠力度最大的）
|
4 years ago |
|
csk
|
10efb08067
Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general
|
4 years ago |
|
hhq
|
2b0937ff30
隐藏门店商品二维码，门店管理二维码，代号：req_hidden_20200610 ；补全一条sql
|
4 years ago |
|
Scott Chen
|
d40d49f539
Merge branch 'master' of csk/kmall-pt-general into master
|
4 years ago |
|
hhq
|
e7371b76d3
调整了分销平台、商品管理、营销平台、系统管理的表单数据显示样式，以及添加了水平滚动条
|
4 years ago |
|
csk
|
dc1ea7f4c1
修改营销列表，取可用数据
|
4 years ago |
|
csk
|
b4437570b8
Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general
|
4 years ago |
|
张创标
|
737a1910f1
Merge branch 'master' of zcb/kmall-pt-general into master
|
4 years ago |
|
zcb
|
d5493e8221
1.对接支付宝退款
|
4 years ago |
|
hhq
|
a3e2676008
添加了一张logo图片，收银端logo修改为此图片；修改了后端管理界面登录默认商户名；调整了会员管理、商户配置、商城配置、营销平台、数据统计、门店管理的表单数据显示样式，以及添加了水平滚动条
|
4 years ago |
|
zcb
|
a6744d8574
Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general
|
4 years ago |
|
zcb
|
dba9f5e65d
kmall-pt-general 提交
|
4 years ago |
|
zcb
|
8b871e88f8
kmall-pt-general 提交
|
4 years ago |
|
zcb
|
69215a6a23
1
|
4 years ago |
|
张创标
|
797651e9bb
Merge branch 'master' of hhq/kmall-pt-general into master
|
4 years ago |
