Commits · b879f033fc38828a18022708fee0ab6c7b5221da · shenshaokai / jinfa-admin

22 Oct, 2020 17 commits
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev · b879f033
  Bill authored Oct 22, 2020
  
  b879f033
- 对接发票以及对公账号配置 · d48280b4
  Bill authored Oct 22, 2020
  
  d48280b4
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 1c97566a
  GuanHua authored Oct 22, 2020
  
  1c97566a
- feat:完成模板预览功能 · 801c1ec8
  GuanHua authored Oct 22, 2020
  
  801c1ec8
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 4ad2efed
  前端-钟卫鹏 authored Oct 22, 2020
  
  4ad2efed
- fix: 商品上架商城和归属地显示变更 · 37ea23df
  前端-钟卫鹏 authored Oct 22, 2020
  
  37ea23df
- 合并路由冲突，保留双方更改 · d7d44e14
  Bill authored Oct 22, 2020
  
  d7d44e14
- 添加结算管理 · 69acfb9e
  Bill authored Oct 22, 2020
  
  69acfb9e
- 添加结算服务 · 617c523c
  前端-许佳敏 authored Oct 22, 2020
  
  617c523c
- fix:恢复需求单,报价单路由 · c11be6c4
  前端-许佳敏 authored Oct 22, 2020
  
  c11be6c4
- fix:恢复需求单,报价单路由 · 44437969
  前端-许佳敏 authored Oct 22, 2020
  
  44437969
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-system into test · f65a03f9
  前端-钟卫鹏 authored Oct 22, 2020
  
  f65a03f9
- merge · 948cbb3a
  前端-钟卫鹏 authored Oct 22, 2020
  
  948cbb3a
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 13c32d69
  前端-钟卫鹏 authored Oct 22, 2020
  
  13c32d69
- fix：交易规则会员名称显示异常/选会员同memberId的数据选择异常、modalTable反选异常 · d236f4c0
  前端-钟卫鹏 authored Oct 22, 2020
  
  d236f4c0
- Merge branch 'dev' into test · 1f5912a4
  XieZhiXiong authored Oct 22, 2020
  
  1f5912a4
- 更改Table rowKey · beb99aa1
  XieZhiXiong authored Oct 22, 2020
  
  beb99aa1
21 Oct, 2020 9 commits
- Merge branch 'dev' into test · 12f49efc
  XieZhiXiong authored Oct 21, 2020
  
  12f49efc
- fixbug · 05f79d79
  XieZhiXiong authored Oct 21, 2020
  
  05f79d79
- 对接完评论相关已有接口 · ff6064b7
  XieZhiXiong authored Oct 21, 2020
  
  ff6064b7
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · aa83bc20
  GuanHua authored Oct 21, 2020
  
  aa83bc20
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 28439d0a
  XieZhiXiong authored Oct 21, 2020
  
  28439d0a
- merge · c7b6688e
  前端-许佳敏 authored Oct 21, 2020
  
  c7b6688e
- merge · 154ce9ba
  前端-许佳敏 authored Oct 21, 2020
  
  154ce9ba
- fix:修复权限能力bug · 7e990265
  前端-许佳敏 authored Oct 21, 2020
  
  7e990265
- fix:限制tabtree为严格模式 · 6b9a5cbb
  前端-许佳敏 authored Oct 21, 2020
  
  6b9a5cbb
20 Oct, 2020 7 commits
- 修改路由 · 7f57b865
  Bill authored Oct 20, 2020
  
  7f57b865
- 修改卤肉 · 65d29728
  Bill authored Oct 20, 2020
  
  65d29728
- 修改路由 · 5f9e46c8
  Bill authored Oct 20, 2020
  
  5f9e46c8
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 8bff2e1f
  GuanHua authored Oct 20, 2020
  
  8bff2e1f
- 解决冲突 · a61ef8ab
  前端-黄佳鑫 authored Oct 20, 2020
  
  a61ef8ab
- 新增询价单 · 17cbf68d
  前端-黄佳鑫 authored Oct 20, 2020
  
  17cbf68d
- 对接评价管理中 · 211431ac
  XieZhiXiong authored Oct 20, 2020
  
  211431ac
19 Oct, 2020 2 commits
- fix: 商品审核状态更改 · 0429057f
  前端-钟卫鹏 authored Oct 19, 2020
  
  0429057f
- 字段为空修复 · 66ed2018
  前端-许佳敏 authored Oct 19, 2020
  
  66ed2018
16 Oct, 2020 3 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · c7dc455e
  前端-钟卫鹏 authored Oct 16, 2020
  
  c7dc455e
- fix:商品详情步骤条异常 · 1785684f
  前端-钟卫鹏 authored Oct 16, 2020
  
  1785684f
- fix · aeefbf35
  前端-钟卫鹏 authored Oct 16, 2020
  
  aeefbf35
15 Oct, 2020 2 commits
- '条件筛选换写法' · a8926610
  LeeJiancong authored Oct 15, 2020
  
  a8926610
- '修改支付策略弹窗接口' · 013bdcbc
  LeeJiancong authored Oct 15, 2020
  
  013bdcbc