Commits · a720855342d4d653a4e28cc7402c39430d418fac · linweijiong / jinfa-platform · GitLab

17 Dec, 2020 17 commits
- Merge branch 'dev' into test · a7208553
  前端-钟卫鹏 authored Dec 17, 2020
  
  a7208553
- fix： · 840c58e1
  前端-钟卫鹏 authored Dec 17, 2020
  
  840c58e1
- Merge branch 'dev' into test · 31879010
  前端-钟卫鹏 authored Dec 17, 2020
  
  31879010
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · be53efc4
  前端-钟卫鹏 authored Dec 17, 2020
  
  be53efc4
- fix： · fe3ea95e
  前端-钟卫鹏 authored Dec 17, 2020
  
  fe3ea95e
- fix： · d78aa05f
  前端-钟卫鹏 authored Dec 17, 2020
  
  d78aa05f
- fix: 修改跳转物流单链接及参数 · 0008a665
  XieZhiXiong authored Dec 17, 2020
  
  0008a665
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 7f707ff6
  GuanHua authored Dec 17, 2020
  
  7f707ff6
- fix: 企业商城模板信息接口更换,修复商品详情库存显示问题 · a2bc0d68
  GuanHua authored Dec 17, 2020
  
  a2bc0d68
- fix：销售订单添加不接受物流单的状态，交易规则添加加工流程交易规则类型，处理采购下单删除已选商品提交数据报错，处理多次支付下单禁用到付 · d7a2c3d1
  前端-钟卫鹏 authored Dec 17, 2020
  
  d7a2c3d1
- Merge branch 'dev' into test · 39994276
  Bill authored Dec 17, 2020
  
  39994276
- fix: 修改物流单跳转地址 · 8c09acc0
  Bill authored Dec 17, 2020
  
  8c09acc0
- Merge branch 'dev' into test · 85869e8e
  Bill authored Dec 17, 2020
  
  85869e8e
- fix: 修改结算试用会员 · 49848366
  Bill authored Dec 17, 2020
  
  49848366
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 39548e5b
  Bill authored Dec 17, 2020
  
  39548e5b
- 修改加工回显加工企业bug · e4d39f8a
  Bill authored Dec 17, 2020
  
  e4d39f8a
- fixbug · b70dbc2b
  XieZhiXiong authored Dec 17, 2020
  
  b70dbc2b
16 Dec, 2020 23 commits
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 792b81aa
  Bill authored Dec 16, 2020
  
  792b81aa
- feat: 增加修改加工生产通知单 · 6ffbbb1e
  Bill authored Dec 16, 2020
  
  6ffbbb1e
- fix · f2a736d1
  Bill authored Dec 16, 2020
  
  f2a736d1
- Merge branch 'dev' into test · b0c877be
  前端-黄佳鑫 authored Dec 16, 2020
  
  b0c877be
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 4ad13e89
  前端-黄佳鑫 authored Dec 16, 2020
  
  4ad13e89
- 修改待新增物流单和编辑物流单 · 24691593
  前端-黄佳鑫 authored Dec 16, 2020
  
  24691593
- Merge branch 'dev' into test · 7f44cb57
  前端-钟卫鹏 authored Dec 16, 2020
  
  7f44cb57
- fix：处理高级筛选重置后无法清空数字和时间范围值 · 9b49aaa2
  前端-钟卫鹏 authored Dec 16, 2020
  
  9b49aaa2
- Merge branch 'dev' into test · 914bece6
  前端-钟卫鹏 authored Dec 16, 2020
  
  914bece6
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 47051a02
  前端-钟卫鹏 authored Dec 16, 2020
  
  47051a02
- fix：处理订单积分支付跳转和生成微信二维码扫码支付 · 1bab887c
  前端-钟卫鹏 authored Dec 16, 2020
  
  1bab887c
- Merge branch 'dev' into test · 47220d90
  XieZhiXiong authored Dec 16, 2020
  
  47220d90
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · d24e613d
  XieZhiXiong authored Dec 16, 2020
  
  d24e613d
- fix: 修复授信相关bug · 41afa775
  XieZhiXiong authored Dec 16, 2020
  
  41afa775
- 合并 · 0692c542
  Bill authored Dec 16, 2020
  
  0692c542
- Merge branch 'dev' into test · 1fc34f63
  Bill authored Dec 16, 2020
  
  1fc34f63
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · eca4ffe3
  GuanHua authored Dec 16, 2020
  
  eca4ffe3
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 6b41524b
  GuanHua authored Dec 16, 2020
  
  6b41524b
- fix: 进货单查询支付方式问题 · 2119b15e
  GuanHua authored Dec 16, 2020
  
  2119b15e
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 60abf477
  Bill authored Dec 16, 2020
  
  60abf477
- 添加手工发货、手工收货 · 5acef646
  Bill authored Dec 16, 2020
  
  5acef646
- Merge branch 'dev' into test · 061b61ca
  前端-黄佳鑫 authored Dec 16, 2020
  
  061b61ca
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 13cb053d
  前端-黄佳鑫 authored Dec 16, 2020
  
  13cb053d