Commits · a8192e547303794a7d393476d590255f61d371cf · linweijiong / jinfa-platform · GitLab

25 Nov, 2020 18 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a8192e54
  前端-许佳敏 authored Nov 25, 2020
  
  a8192e54
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 718541f4
  XieZhiXiong authored Nov 25, 2020
  
  718541f4
- 单据明细不需要展示的字段都放到一个字段里边 · ce59da78
  XieZhiXiong authored Nov 25, 2020
  
  ce59da78
- fix;修改订单结算新增个人类型发票填写项问题 · da7ccfcf
  GuanHua authored Nov 25, 2020
  
  da7ccfcf
- 补充原型内容 · 11091e49
  XieZhiXiong authored Nov 25, 2020
  
  11091e49
- 删除不必要的代码 · 09ee4aaa
  XieZhiXiong authored Nov 25, 2020
  
  09ee4aaa
- feat:修改商城首页用户信息显示 · 3fb09f60
  GuanHua authored Nov 25, 2020
  
  3fb09f60
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 21abe57a
  GuanHua authored Nov 25, 2020
  
  21abe57a
- feat:对接积分兑换 · 7418f22f
  GuanHua authored Nov 25, 2020
  
  7418f22f
- 对接后台接口修改 · f918fd14
  XieZhiXiong authored Nov 25, 2020
  
  f918fd14
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 3615b270
  前端-许佳敏 authored Nov 25, 2020
  
  3615b270
- Merge branch 'dev' into test · a02a6fe6
  前端-钟卫鹏 authored Nov 25, 2020
  
  a02a6fe6
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 90356b39
  XieZhiXiong authored Nov 25, 2020
  
  90356b39
- 修改接口 · d297588d
  XieZhiXiong authored Nov 25, 2020
  
  d297588d
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ad0e75c7
  前端-许佳敏 authored Nov 25, 2020
  
  ad0e75c7
- fixbug · 52c79c9b
  XieZhiXiong authored Nov 25, 2020
  
  52c79c9b
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 1e1e4c9d
  前端-钟卫鹏 authored Nov 25, 2020
  
  1e1e4c9d
- fix：处理销售订单区块字段显示异常、待确认订单添加合同签署供功能，处理新增采购订单数量大于最小起订数商品数据显示异常，处理商品提交审核后编辑时需要传入规格id、商品上架查询店铺时添加会员角色字段 · 48777062
  前端-钟卫鹏 authored Nov 25, 2020
  
  48777062
24 Nov, 2020 14 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 677572ee
  前端-许佳敏 authored Nov 24, 2020
  
  677572ee
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 28a0b16c
  Bill authored Nov 24, 2020
  
  28a0b16c
- 修改加工 · 1bbee90d
  Bill authored Nov 24, 2020
  
  1bbee90d
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · da6c6ae6
  前端-许佳敏 authored Nov 24, 2020
  
  da6c6ae6
- fixbug · 92295fae
  XieZhiXiong authored Nov 24, 2020
  
  92295fae
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 968311d7
  前端-许佳敏 authored Nov 24, 2020
  
  968311d7
- 完成加工单相关 · ee9e16ad
  XieZhiXiong authored Nov 24, 2020
  
  ee9e16ad
- 调整cd · 1b64ae16
  前端-许佳敏 authored Nov 24, 2020
  
  1b64ae16
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ba3d3627
  前端-许佳敏 authored Nov 24, 2020
  
  ba3d3627
- 尝试调整构建cd · 884cbe34
  前端-许佳敏 authored Nov 24, 2020
  
  884cbe34
- Merge branch 'dev' into test · 804b39cb
  XieZhiXiong authored Nov 24, 2020
  
  804b39cb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 97e4aec6
  XieZhiXiong authored Nov 24, 2020
  
  97e4aec6
- fixbug · eedf7dfb
  XieZhiXiong authored Nov 24, 2020
  
  eedf7dfb
- feat:有合同流程的新增订单添加合同id字段 · 1281ab95
  GuanHua authored Nov 24, 2020
  
  1281ab95
23 Nov, 2020 8 commits
- Merge branch 'dev' into test · fd455830
  前端-黄佳鑫 authored Nov 23, 2020
  
  fd455830
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · f93466ce
  前端-黄佳鑫 authored Nov 23, 2020
  
  f93466ce
- 修改需求发布需求报价确认需求报价得外部内部状态显示 · 7faf08c3
  前端-黄佳鑫 authored Nov 23, 2020
  
  7faf08c3
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 851afab3
  Bill authored Nov 23, 2020
  
  851afab3
- 对接首页，对接加工模块，加密修改密码模块 · 3eee0593
  Bill authored Nov 23, 2020
  
  3eee0593
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a8e67237
  XieZhiXiong authored Nov 23, 2020
  
  a8e67237
- 对接中加工发货单中 · 045eb3ed
  XieZhiXiong authored Nov 23, 2020
  
  045eb3ed
- fix:购买数量低于最小订购量,可以加入购物车的问题 · 89862bb2
  GuanHua authored Nov 23, 2020
  
  89862bb2