Commits · c241115972a0a9e22e936b096842c7ecaaba865f · linweijiong / jinfa-platform · GitLab

21 Dec, 2020 18 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
- fix： · 1f03e120
  前端-钟卫鹏 authored Dec 21, 2020
  
  1f03e120
18 Dec, 2020 17 commits
- Merge branch 'dev' into test · a3a66399
  前端-黄佳鑫 authored Dec 18, 2020
  
  a3a66399
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 29dabba3
  前端-黄佳鑫 authored Dec 18, 2020
  
  29dabba3
- 修改物流，商品询价，询价报价，搜索的问题 · b752320a
  前端-黄佳鑫 authored Dec 18, 2020
  
  b752320a
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · f64a1b8c
  GuanHua authored Dec 18, 2020
  
  f64a1b8c
- feat: 更新依赖包版本 · c7f78b75
  GuanHua authored Dec 18, 2020
  
  c7f78b75
- Merge branch 'dev' into test · 3d5b83d4
  前端-钟卫鹏 authored Dec 18, 2020
  
  3d5b83d4
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test · f0e03866
  前端-钟卫鹏 authored Dec 18, 2020
  
  f0e03866
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a63820dd
  前端-钟卫鹏 authored Dec 18, 2020
  
  a63820dd
- fix：处理采购下单查找运费提示为数量不能为空 · b4269c7f
  前端-钟卫鹏 authored Dec 18, 2020
  
  b4269c7f
- fix: 禁止查询授信信息接口弹出提示 · 4d011208
  GuanHua authored Dec 18, 2020
  
  4d011208
- fix：待新增物流单添加修改物流单跳转，补齐内外部流转记录0为订单完成状态，处理商品阶梯价格间间距为最小起订数的最小精度 · cbe457d1
  前端-钟卫鹏 authored Dec 18, 2020
  
  cbe457d1
- Merge branch 'dev' into test · c7d00914
  Bill authored Dec 18, 2020
  
  c7d00914
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · ff482d7f
  Bill authored Dec 18, 2020
  
  ff482d7f
- fix: 修改加工生产通知单详情页不通过原因 · d71461da
  Bill authored Dec 18, 2020
  
  d71461da
- 修改物流单选择商品传错id的问题 · 76fba132
  前端-黄佳鑫 authored Dec 18, 2020
  
  76fba132
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 9ebed4c5
  前端-黄佳鑫 authored Dec 18, 2020
  
  9ebed4c5
- 修改物流模块 · cbfc8afd
  前端-黄佳鑫 authored Dec 18, 2020
  
  cbfc8afd
17 Dec, 2020 5 commits
- Merge branch 'dev' into test · 64f9b519
  前端-钟卫鹏 authored Dec 17, 2020
  
  64f9b519
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 65cb3ab4
  前端-钟卫鹏 authored Dec 17, 2020
  
  65cb3ab4
- fix：处理订单详情内部状态显示异常，处理销售待审核订单修改运费后价格总计价格不同步更新的问题 · b72de57e
  前端-钟卫鹏 authored Dec 17, 2020
  
  b72de57e
- fix：修改开始结束时间参数格式 · 01f150d2
  XieZhiXiong authored Dec 17, 2020
  
  01f150d2
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · bf756820
  XieZhiXiong authored Dec 17, 2020
  
  bf756820