Commits · e86e7d0d41768a93931b171019add3c1de374da4 · project / jinfa-admin · GitLab

17 Dec, 2020 8 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · e86e7d0d
  前端-黄佳鑫 authored Dec 17, 2020
  
  e86e7d0d
- 修改系统管理单位新增删除 · 60e276c7
  前端-黄佳鑫 authored Dec 17, 2020
  
  60e276c7
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev · d5e7b1e7
  Bill authored Dec 17, 2020
  
  d5e7b1e7
- 修改结算对公账号配置 · 7731c5a5
  Bill authored Dec 17, 2020
  
  7731c5a5
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 4c9d782a
  GuanHua authored Dec 17, 2020
  
  4c9d782a
- fix: 修改商城模板装修相关接口路径 · c561d1f8
  GuanHua authored Dec 17, 2020
  
  c561d1f8
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev · ecab126e
  Bill authored Dec 17, 2020
  
  ecab126e
- fix: 修改结算策略bug · ddfb49e2
  Bill authored Dec 17, 2020
  
  ddfb49e2
16 Dec, 2020 4 commits
- fix: 修改企业商城接口路径 · c4d299ae
  GuanHua authored Dec 16, 2020
  
  c4d299ae
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 0a575d43
  前端-钟卫鹏 authored Dec 16, 2020
  
  0a575d43
- fix：处理订单列表高级筛选异常 · eaad0500
  前端-钟卫鹏 authored Dec 16, 2020
  
  eaad0500
- fix: 修复模板接口找不到的问题 · 7c12e5a7
  GuanHua authored Dec 16, 2020
  
  7c12e5a7
14 Dec, 2020 5 commits
- fix：处理订单自提方式显示自提地址 · 1c0bd081
  前端-钟卫鹏 authored Dec 14, 2020
  
  1c0bd081
- chore: 修改npm源 · b0204163
  前端-许佳敏 authored Dec 14, 2020
  
  b0204163
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · c0f6a0c4
  前端-钟卫鹏 authored Dec 14, 2020
  
  c0f6a0c4
- fix： · 9147875e
  前端-钟卫鹏 authored Dec 14, 2020
  
  9147875e
- fix: 模板接口地址修改 · a298b483
  GuanHua authored Dec 14, 2020
  
  a298b483
11 Dec, 2020 4 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · ff6d289e
  前端-钟卫鹏 authored Dec 11, 2020
  
  ff6d289e
- fix：订单详情中获取支付方式添加会员角色字段，订单内部/外部流转记录更新 · 52048501
  前端-钟卫鹏 authored Dec 11, 2020
  
  52048501
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 9623ea13
  XieZhiXiong authored Dec 11, 2020
  
  9623ea13
- 修改积分展示 · 32f8c7c6
  XieZhiXiong authored Dec 11, 2020
  
  32f8c7c6
10 Dec, 2020 4 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 2c4fccea
  前端-钟卫鹏 authored Dec 10, 2020
  
  2c4fccea
- fix：查询品牌详情参数id变更为审核品牌后的返回最新id · 036a0c11
  前端-钟卫鹏 authored Dec 10, 2020
  
  036a0c11
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev · 9884b79b
  Bill authored Dec 10, 2020
  
  9884b79b
- feat: 新增修改密码 · 1cde8e81
  Bill authored Dec 10, 2020
  
  1cde8e81
09 Dec, 2020 2 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 295bbda2
  前端-黄佳鑫 authored Dec 09, 2020
  
  295bbda2
- 修改支付策略配置 · b32313d9
  前端-黄佳鑫 authored Dec 09, 2020
  
  b32313d9
08 Dec, 2020 2 commits
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev · b216edfd
  Bill authored Dec 08, 2020
  
  b216edfd
- chore: 修改package.json 1o和25环境需要添加socket端口 · 3e55f2da
  Bill authored Dec 08, 2020
  
  3e55f2da
07 Dec, 2020 11 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 45f32bf9
  前端-黄佳鑫 authored Dec 07, 2020
  
  45f32bf9
- 修改会员支付策略 · 5a2043bf
  前端-黄佳鑫 authored Dec 07, 2020
  
  5a2043bf
- fix: 修改package.json socket端口 · 92abd711
  Bill authored Dec 07, 2020
  
  92abd711
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev · e971aacd
  Bill authored Dec 07, 2020
  
  e971aacd
- fix: 修改socket · 4d30cea4
  Bill authored Dec 07, 2020
  
  4d30cea4
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · a6fd8a0b
  前端-钟卫鹏 authored Dec 07, 2020
  
  a6fd8a0b
- 完善单位，系统参数接口接入 · 9758bebe
  前端-黄佳鑫 authored Dec 07, 2020
  
  9758bebe
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · fd85306b
  前端-钟卫鹏 authored Dec 07, 2020
  
  fd85306b
- fix: 去掉注释页 · 9076227d
  前端-许佳敏 authored Dec 07, 2020
  
  9076227d
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 5ea0ab2e
  前端-钟卫鹏 authored Dec 07, 2020
  
  5ea0ab2e
- fix：处理订单确认支付结果无法返回列表页 · 5b6e6d9f
  前端-钟卫鹏 authored Dec 07, 2020
  
  5b6e6d9f