 pref_mail@163.com
|
878fd6c0ea
|
增加商场推送的取消
|
8 months ago |
|
pref_mail@163.com
|
2145f5c047
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
pref_mail@163.com
|
2d303bd9fe
|
Merge branch 'dev' into 新增商家端
|
8 months ago |
|
pref_mail@163.com
|
ef67e9d1ee
|
优化自提的速度
|
8 months ago |
zhaoqiaobo
|
dc894fd6cf
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
58b586ae7b
|
feat(all): 修改价格体系仓储和配送价格导入不成功问题
|
8 months ago |
|
pref_mail@163.com
|
67ca2cd2c9
|
Merge branch 'dev' into 新增商家端
# Conflicts:
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml
|
8 months ago |
|
pref_mail@163.com
|
8665f1c5e7
|
修改租户数据没有tenanId无效的问题
|
8 months ago |
|
zhaoqiaobo
|
fbc0c24d1b
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
506ed4a206
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 months ago |
|
zhaoqiaobo
|
c69fa218dd
|
feat(all): 修改价格体系品类的校验
|
8 months ago |
|
pref_mail@163.com
|
814d57331e
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
pref_mail@163.com
|
2509ad8951
|
Merge remote-tracking branch 'origin/pre-production' into pre-production
|
8 months ago |
|
pref_mail@163.com
|
2b7f9313c6
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 months ago |
|
pref_mail@163.com
|
684a29c0ec
|
修改运单打印
|
8 months ago |
|
zhaoqiaobo
|
09a17ef462
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
039e47f7ee
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 months ago |
|
zhaoqiaobo
|
112110f924
|
feat(all): 修改价格体系时间边界控制
|
8 months ago |
|
pref_mail@163.com
|
c0620383bf
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
pref_mail@163.com
|
49ed3200d1
|
增加测试租户
|
8 months ago |
 汤建军
|
dd6b1f12c3
|
入库单BUG修复
|
8 months ago |
|
汤建军
|
5690f02b53
|
Merge remote-tracking branch 'origin/pre-production' into pre-production
|
8 months ago |
|
汤建军
|
ff2c2ce9ad
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
汤建军
|
2eef1ee3fd
|
入库单BUG修复
|
8 months ago |
|
pref_mail@163.com
|
8c3894842c
|
增加测试租户
|
8 months ago |
|
汤建军
|
a976336fca
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
汤建军
|
8aca3158a6
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 months ago |
|
汤建军
|
446050cbcd
|
配送推送老系统BUg修复
|
8 months ago |
|
zhaoqiaobo
|
a17c713454
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
b38afac610
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 months ago |
|
zhaoqiaobo
|
8b2b758533
|
feat(all): 增加价格删除待生效的数据
|
8 months ago |
|
汤建军
|
5b37ca1aec
|
入库单BUG修复
|
8 months ago |
|
zhaoqiaobo
|
914b3562f7
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
ab7c70dcd7
|
feat(all): 修改价格模版名称唯一校验时无法通过问题
|
8 months ago |
|
zhaoqiaobo
|
9cf47a6fa6
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
a379d9afbf
|
feat(all): 修改价格体系多版本维护问题
1 增加历史版本页面生效状态
|
8 months ago |
|
zhaoqiaobo
|
7e7baef71c
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
8d9d618ee8
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 months ago |
|
zhaoqiaobo
|
8c54d1580e
|
feat(all): 修改价格体系新增多个版本问题
|
8 months ago |
zhenghaoyu
|
c8ad51d940
|
1.关闭状态为1的老系统入库
|
8 months ago |
|
zhenghaoyu
|
c7e4cf880b
|
1.运单审核列表功能
|
8 months ago |
|
汤建军
|
d9b9517ef2
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
汤建军
|
a82c50e7df
|
入库单BUG修复
|
8 months ago |
|
汤建军
|
407a7d74aa
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
汤建军
|
88cafd62ae
|
入库单BUG修复
|
8 months ago |
|
zhaoqiaobo
|
0d6d14ba4c
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
b1848fe78b
|
feat(all): 修改价格列表页面品牌不展示问题
|
8 months ago |
|
zhaoqiaobo
|
a75b25efd3
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
98c3d4c755
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 months ago |
|
zhaoqiaobo
|
324651b2d7
|
feat(all): 修改价格体系保存逻辑
1 兼容同时存在按区域计费和统一计费的情况
|
8 months ago |
