Commits · 4f6cbcf813527cd769d6d84b1c23dfcb3c0db52c · shenshaokai / jinfa-platform · GitLab

18 Mar, 2022 25 commits
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 4f6cbcf8
  Bill authored Mar 18, 2022
  
  4f6cbcf8
- Merge branch 'v2' into v2-220318 · f4f3abce
  Bill authored Mar 18, 2022
  
  f4f3abce
- fix: 修改品类导航活动商品品类为空导致报错bug · 3441a3ef
  Bill authored Mar 18, 2022
  
  3441a3ef
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · ba6b7b7a
  前端-钟卫鹏 authored Mar 18, 2022
  
  ba6b7b7a
- fix: 商品上架引导查询交易规则添加跨境字段，处理仓位二级页面返回列表为空的问题 · 16c82204
  前端-钟卫鹏 authored Mar 18, 2022
  
  16c82204
- Merge branch 'v2' into v2-220318 · d2dc5b24
  XieZhiXiong authored Mar 18, 2022
  
  d2dc5b24
- fix: 修改考评单考评权重考评计分权重 · 9308865d
  Bill authored Mar 18, 2022
  
  9308865d
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · 3016f42c
  Bill authored Mar 18, 2022
  
  3016f42c
- fix: 修改品类导航精选商品自定义类型bug · fb5bf56a
  Bill authored Mar 18, 2022
  
  fb5bf56a
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · efc19f10
  xiexiuxing authored Mar 18, 2022
  
  efc19f10
- fix: 合并0212版本合同代码 · 16c6d3b0
  xiexiuxing authored Mar 18, 2022
  
  16c6d3b0
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · bd6c9290
  前端-黄佳鑫 authored Mar 18, 2022
  
  bd6c9290
- fix: 营销活动换购主商品过滤 · 80bcaba6
  前端-黄佳鑫 authored Mar 18, 2022
  
  80bcaba6
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · ab836c42
  前端-钟卫鹏 authored Mar 18, 2022
  
  ab836c42
- fix: 处理待核销订单筛选异常 · 3d29dc23
  前端-钟卫鹏 authored Mar 18, 2022
  
  3d29dc23
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 94ea8499
  Lfy-12 authored Mar 18, 2022
  
  94ea8499
- 修改为物料 · 9e5d04cd
  Lfy-12 authored Mar 18, 2022
  
  9e5d04cd
- fix: 修复营销活动搭配商品不能选和当前主商品相同 · 1a9f8cbd
  前端-黄佳鑫 authored Mar 18, 2022
  
  1a9f8cbd
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 975b24cb
  前端-黄佳鑫 authored Mar 18, 2022
  
  975b24cb
- fix: 去掉采购询价需求对接进入店铺等选项 · 70cfdf47
  前端-黄佳鑫 authored Mar 18, 2022
  
  70cfdf47
- Merge branch 'v2' into v2-220318 · b618e2a9
  Bill authored Mar 18, 2022
  
  b618e2a9
- fix: 修改会员考评会员权重正则 · 416f7446
  Bill authored Mar 18, 2022
  
  416f7446
- merge: 合并冲突 · 3f27013f
  Bill authored Mar 18, 2022
  
  3f27013f
- fix: 修改结算实付搜索条件以及会员考评创建考评单校验信息 · 3bb50028
  Bill authored Mar 18, 2022
  
  3bb50028
- fix: 注册接口根据返回额状态判断是否需要审核 · dea09c15
  GuanHua authored Mar 18, 2022
  
  dea09c15
17 Mar, 2022 12 commits
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 1446303b
  GuanHua authored Mar 17, 2022
  
  1446303b
- fix: 修改自营商城装修标题栏链接问题和注册添加saas逻辑处理 · ba2cf808
  GuanHua authored Mar 17, 2022
  
  ba2cf808
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 0e075d4b
  前端-钟卫鹏 authored Mar 17, 2022
  
  0e075d4b
- fix: 处理待核销订单和核销自提码的问题 · f3a59d7f
  前端-钟卫鹏 authored Mar 17, 2022
  
  f3a59d7f
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · c9bbdb7e
  前端-黄佳鑫 authored Mar 17, 2022
  
  c9bbdb7e
- fix: 修复0318BUG · 767e11b0
  前端-黄佳鑫 authored Mar 17, 2022
  
  767e11b0
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 33cc23dc
  前端-钟卫鹏 authored Mar 17, 2022
  
  33cc23dc
- fix: 现货下单选择会员根据是否设置多租户来调取接口 · 364a78e8
  前端-钟卫鹏 authored Mar 17, 2022
  
  364a78e8
- fix: 待支付订单对接跨境电商支付方式支付 · fedfffce
  前端-钟卫鹏 authored Mar 17, 2022
  
  fedfffce
- chore: 重新选择上级会员清空会员类型、会员角色选项 · fd9efbee
  XieZhiXiong authored Mar 17, 2022
  
  fd9efbee
- fix: 修复确认询价报价搜索报价会员字段错误问题 · 4938c8fc
  前端-黄佳鑫 authored Mar 17, 2022
  
  4938c8fc
- fix: 修复确认询价报价搜索报价会员字段错误问题 · 065667de
  前端-黄佳鑫 authored Mar 17, 2022
  
  065667de
16 Mar, 2022 3 commits
- merge: v2版本 · c7da812b
  前端-许佳敏 authored Mar 16, 2022
  
  c7da812b
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · c85ec86c
  前端-钟卫鹏 authored Mar 16, 2022
  
  c85ec86c
- fix: 属性属性值编辑隐藏MRO的问题 · 90e9360e
  前端-钟卫鹏 authored Mar 16, 2022
  
  90e9360e