Commits · 1397512d95aafde48268dcf800c6e468f7cb26c7 · shenshaokai / jinfa-admin · GitLab

05 Jan, 2021 3 commits
- Merge branch 'test' of lingxi/lingxi-business-system into master · 1397512d
  git authored Jan 05, 2021
  
  1397512d
- Merge branch 'dev' into test · d03ebaf4
  前端-钟卫鹏 authored Jan 05, 2021
  
  d03ebaf4
- fix：简单流程订单添加发货信息显示 · 380d1018
  前端-钟卫鹏 authored Jan 05, 2021
  
  380d1018
04 Jan, 2021 4 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 73dd81d0
  前端-钟卫鹏 authored Jan 04, 2021
  
  73dd81d0
- fix：添加logo · 7b9e270d
  前端-钟卫鹏 authored Jan 04, 2021
  
  7b9e270d
- fix: 添加logo · 3a25aa40
  前端-钟卫鹏 authored Jan 04, 2021
  
  3a25aa40
- Merge branch 'dev' into test · a1b76f0e
  Bill authored Jan 04, 2021
  
  a1b76f0e
31 Dec, 2020 10 commits
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev · 4619cf15
  Bill authored Dec 31, 2020
  
  4619cf15
- fix: 修改发票bug · a941b2b8
  Bill authored Dec 31, 2020
  
  a941b2b8
- Merge branch 'dev' into test · a7754ee3
  XieZhiXiong authored Dec 31, 2020
  
  a7754ee3
- fix: 修复产品名称不显示的问题 · 7f97fee0
  XieZhiXiong authored Dec 31, 2020
  
  7f97fee0
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · a27553dc
  XieZhiXiong authored Dec 31, 2020
  
  a27553dc
- chore: 添加搜索框 Tip 提示 · 612cda66
  XieZhiXiong authored Dec 31, 2020
  
  612cda66
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · c2e522d1
  前端-钟卫鹏 authored Dec 31, 2020
  
  c2e522d1
- fix：订单不显示内部状态 · a6dbc4ce
  前端-钟卫鹏 authored Dec 31, 2020
  
  a6dbc4ce
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev · 19e7265d
  Bill authored Dec 31, 2020
  
  19e7265d
- 修改消息bug · 5e1f254f
  Bill authored Dec 31, 2020
  
  5e1f254f
29 Dec, 2020 4 commits
- fix: 修复布局变形的问题 · ab4b92fd
  XieZhiXiong authored Dec 29, 2020
  
  ab4b92fd
- feat: 添加退款对应弹窗内容显示 · a3ad5bf8
  XieZhiXiong authored Dec 29, 2020
  
  a3ad5bf8
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 4dfcd1e8
  XieZhiXiong authored Dec 29, 2020
  
  4dfcd1e8
- 内容管理-广告管理添加投放渠道字段 · 4febc025
  Bill authored Dec 29, 2020
  
  4febc025
28 Dec, 2020 10 commits
- Merge branch 'dev' into test · b4b621b1
  前端-黄佳鑫 authored Dec 28, 2020
  
  b4b621b1
- 修改会员支付策略 · 492b2cb3
  前端-黄佳鑫 authored Dec 28, 2020
  
  492b2cb3
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · b89bc9da
  前端-黄佳鑫 authored Dec 28, 2020
  
  b89bc9da
- 重构会员支付参数配置 · 00344e15
  前端-黄佳鑫 authored Dec 28, 2020
  
  00344e15
- Merge branch 'dev' into test · 9aab7ff4
  前端-钟卫鹏 authored Dec 28, 2020
  
  9aab7ff4
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · d9e5921a
  前端-钟卫鹏 authored Dec 28, 2020
  
  d9e5921a
- fix：处理订单重置和时间筛选异常 · 95f005f5
  前端-钟卫鹏 authored Dec 28, 2020
  
  95f005f5
- Merge branch 'dev' into test · 82cd56d9
  Bill authored Dec 28, 2020
  
  82cd56d9
- 添加删除结算策略 · 2163c70c
  Bill authored Dec 28, 2020
  
  2163c70c
- fix: 添加是否可退款判断 · c1a0cfc2
  XieZhiXiong authored Dec 28, 2020
  
  c1a0cfc2
25 Dec, 2020 2 commits
- Merge branch 'dev' into test · fc2c1aa6
  Bill authored Dec 25, 2020
  
  fc2c1aa6
- 修改结算付款 · 63cee027
  Bill authored Dec 25, 2020
  
  63cee027
24 Dec, 2020 7 commits
- Merge branch 'dev' into test · 94069bef
  Bill authored Dec 24, 2020
  
  94069bef
- 修改消息布局 · ea57483e
  Bill authored Dec 24, 2020
  
  ea57483e
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev · 539a8cb2
  Bill authored Dec 24, 2020
  
  539a8cb2
- 修改结算搜索bug，以及消息列表页 · bd2ab9ff
  Bill authored Dec 24, 2020
  
  bd2ab9ff
- Merge branch 'dev' into test · d0b762fd
  前端-钟卫鹏 authored Dec 24, 2020
  
  d0b762fd
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-system into test · db758c6a
  前端-钟卫鹏 authored Dec 24, 2020
  
  db758c6a
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 886063cf
  前端-钟卫鹏 authored Dec 24, 2020
  
  886063cf