Commits · 3999427635aad8041b1b11f4c3d578f2bdba2a9c · linweijiong / jinfa-platform · GitLab

17 Dec, 2020 7 commits
- 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 25 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
- 修改其他地方跳到物流调接口的问题 · 64a68531
  前端-黄佳鑫 authored Dec 16, 2020
  
  64a68531
- fix: 修复模板装修相关bug · fadff86f
  GuanHua authored Dec 16, 2020
  
  fadff86f
15 Dec, 2020 8 commits
- 合并冲突 · 95bacda4
  Bill authored Dec 15, 2020
  
  95bacda4
- fix: 修改生产通知单 · 36c37873
  Bill authored Dec 15, 2020
  
  36c37873
- Merge branch 'dev' into test · f1ec16f5
  前端-黄佳鑫 authored Dec 15, 2020
  
  f1ec16f5
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 2225cf69
  前端-黄佳鑫 authored Dec 15, 2020
  
  2225cf69
- 修改待新增物流单 · 4e48cc96
  前端-黄佳鑫 authored Dec 15, 2020
  
  4e48cc96
- fix: 修改商城首页接口路径 · fd9e08a3
  GuanHua authored Dec 15, 2020
  
  fd9e08a3
- fix: 评价相关bug · b75f1e10
  XieZhiXiong authored Dec 15, 2020
  
  b75f1e10
- merge · f9d3479e
  XieZhiXiong authored Dec 15, 2020
  
  f9d3479e