Commits · 7d1a0658c418dbb38ee76240ff9ee1548ad66f0e · linweijiong / jinfa-platform · GitLab

22 Dec, 2020 23 commits
- Merge branch 'dev' into test · 7d1a0658
  Bill authored Dec 22, 2020
  
  7d1a0658
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · bd6c9875
  Bill authored Dec 22, 2020
  
  bd6c9875
- fix: 修改字段名称 · be8041d3
  XieZhiXiong authored Dec 22, 2020
  
  be8041d3
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 156ff3ea
  Bill authored Dec 22, 2020
  
  156ff3ea
- fix: 加工与结算bug · 196d77b5
  Bill authored Dec 22, 2020
  
  196d77b5
- feat: 新增单据换货发货单、入库单相关逻辑 · cd578616
  XieZhiXiong authored Dec 22, 2020
  
  cd578616
- feat: 新增单据换货退货入库单相关逻辑 · 945a00cf
  XieZhiXiong authored Dec 22, 2020
  
  945a00cf
- feat: 新增单据换货退货发货单相关逻辑 · 05669222
  XieZhiXiong authored Dec 22, 2020
  
  05669222
- feat: 新增单据退货入库单相关逻辑 · 84b9e6c0
  XieZhiXiong authored Dec 22, 2020
  
  84b9e6c0
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 928a8162
  XieZhiXiong authored Dec 22, 2020
  
  928a8162
- feat: 新增单据退货发货单相关逻辑 · a5649e79
  XieZhiXiong authored Dec 22, 2020
  
  a5649e79
- 添加修改生产通知单相关逻辑 · 5adf255d
  XieZhiXiong authored Dec 22, 2020
  
  5adf255d
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 82ccea90
  Bill authored Dec 22, 2020
  
  82ccea90
- fix: 修改首页bug · 780f4c11
  Bill authored Dec 22, 2020
  
  780f4c11
- Merge branch 'dev' into test · 7d14c639
  前端-黄佳鑫 authored Dec 22, 2020
  
  7d14c639
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 45490e90
  前端-黄佳鑫 authored Dec 22, 2020
  
  45490e90
- fix: 修改各处跳转物流单提交选择商品id的问题 · d4551eaf
  前端-黄佳鑫 authored Dec 22, 2020
  
  d4551eaf
- fix: 修复数据不展示的问题 · d781fc99
  XieZhiXiong authored Dec 22, 2020
  
  d781fc99
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 79ad14e5
  XieZhiXiong authored Dec 22, 2020
  
  79ad14e5
- fix: 修复操作按钮显示错误的问题 · 29109a26
  XieZhiXiong authored Dec 22, 2020
  
  29109a26
- Merge branch 'dev' into test · d0aa4d6f
  前端-钟卫鹏 authored Dec 22, 2020
  
  d0aa4d6f
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · b93d4c2d
  前端-钟卫鹏 authored Dec 22, 2020
  
  b93d4c2d
- feat：商品区块品类属性添加同步平台品类和属性的操作 · 98d59ce0
  前端-钟卫鹏 authored Dec 22, 2020
  
  98d59ce0
21 Dec, 2020 17 commits
- Merge branch 'dev' into test · c2411159
  Bill authored Dec 21, 2020
  
  c2411159
- 合并冲突 · 28021cdf
  Bill authored Dec 21, 2020
  
  28021cdf
- 修改加工bug · 002d9840
  Bill authored Dec 21, 2020
  
  002d9840
- fix: 修改商品详情->交易记录数据显示异常的问题 · ee826c92
  GuanHua authored Dec 21, 2020
  
  ee826c92
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 1600b538
  GuanHua authored Dec 21, 2020
  
  1600b538
- fix: 修改在线求购接口筛选参数 · babfb93a
  GuanHua authored Dec 21, 2020
  
  babfb93a
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · d877e1d5
  XieZhiXiong authored Dec 21, 2020
  
  d877e1d5
- change: 修改单据数量校验正则 · 063cec32
  XieZhiXiong authored Dec 21, 2020
  
  063cec32
- Merge branch 'dev' into test · 23d51ca9
  前端-钟卫鹏 authored Dec 21, 2020
  
  23d51ca9
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · fe4a565c
  前端-钟卫鹏 authored Dec 21, 2020
  
  fe4a565c
- fix：处理编辑商品回显阶梯价格时乱序问题，新增仓位添加仓库名称字段，处理资金账户详情状态记录错误的问题，处理待支付订单中二次支付异常问题 · 484f889d
  前端-钟卫鹏 authored Dec 21, 2020
  
  484f889d
- merge · 19509777
  XieZhiXiong authored Dec 21, 2020
  
  19509777
- fix: 修复售后相关问题 · 087ff74c
  XieZhiXiong authored Dec 21, 2020
  
  087ff74c
- fix: 支付页面未显示出支付错误信息的问题 · 8a0f5775
  GuanHua authored Dec 21, 2020
  
  8a0f5775
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ffe6d9b4
  GuanHua authored Dec 21, 2020
  
  ffe6d9b4
- Merge branch 'dev' into test · 8456b6db
  前端-钟卫鹏 authored Dec 21, 2020
  
  8456b6db
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a57249f5
  前端-钟卫鹏 authored Dec 21, 2020
  
  a57249f5