Commits · d67dbfeb951b115ba543b68a2392b8367e39499e · 董敬伟 / liquidnet-bus-v1

11 Nov, 2021 10 commits
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · d67dbfeb
  zhouhuan authored Nov 11, 2021
  
  d67dbfeb
- 加空格 · 77ecf657
  zhouhuan authored Nov 11, 2021
  
  77ecf657
- 划卡计数 · f243c714
  胡佳晨 authored Nov 11, 2021
  
  f243c714
- 配置文件添加redis · 308378e4
  胡佳晨 authored Nov 11, 2021
  
  308378e4
- admin · c7a0c95c
  胡佳晨 authored Nov 11, 2021
  
  c7a0c95c
- admin · 699431b4
  胡佳晨 authored Nov 11, 2021
  
  699431b4
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · 6a35bb92
  胡佳晨 authored Nov 11, 2021
  
  6a35bb92
- admin · 11572602
  胡佳晨 authored Nov 11, 2021
  
  11572602
- 更改回去 · 508070b3
  zhouhuan authored Nov 11, 2021
  
  508070b3
- admin 注销sortName: "createdAt"，sortOrder: "desc", · 41798e1c
  zhouhuan authored Nov 11, 2021
  
  41798e1c
10 Nov, 2021 26 commits
- admin · 6dae91d8
  胡佳晨 authored Nov 10, 2021
  
  6dae91d8
- 更正上传图片URL; · 3306269b
  张国柄 authored Nov 10, 2021
  
  3306269b
- Merge remote-tracking branch 'origin/master' into dev_20111115 · eedff160
  张国柄 authored Nov 10, 2021
  
  eedff160
- Merge branch 'pre' into 'master' · f2282c1a
  Administrator authored Nov 10, 2021
```
fix:更正上传图片地址;

See merge request !116
```
  f2282c1a
- fix:更正上传图片地址; · 3b820f61
  张国柄 authored Nov 10, 2021
  
  3b820f61
- 修改 admin · ea4f0830
  胡佳晨 authored Nov 10, 2021
  
  ea4f0830
- 修改 admin · b83da537
  胡佳晨 authored Nov 10, 2021
  
  b83da537
- 修改 admin · 6713598e
  胡佳晨 authored Nov 10, 2021
  
  6713598e
- 无库存的时候-1要回滚 · a7226c48
  jiangxiulong authored Nov 10, 2021
  
  a7226c48
- JxlMathUtil · 57011822
  jiangxiulong authored Nov 10, 2021
  
  57011822
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · 78a26b88
  jiangxiulong authored Nov 10, 2021
  
  78a26b88
- 库存先查old · e937b544
  jiangxiulong authored Nov 10, 2021
  
  e937b544
- 修改前端之前数据渲染bug · bf8dc9ea
  dongchun authored Nov 10, 2021
  
  bf8dc9ea
- 修改前端bug · 44543e69
  dongchun authored Nov 10, 2021
  
  44543e69
- 调整:券发放任务逻辑:券领取类型为`2-积分兑换`的处理; · e3c7b407
  张国柄 authored Nov 10, 2021
  
  e3c7b407
- 页面调整; · f5dd57ab
  张国柄 authored Nov 10, 2021
  
  f5dd57ab
- mergeRoadList · 94b8446c
  jiangxiulong authored Nov 10, 2021
  
  94b8446c
- Merge branch 'dev_20111115' of... · a1efff72
  jiangxiulong authored Nov 10, 2021
```
Merge branch 'dev_20111115' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev_20111115
```
  a1efff72
- mergeRoadList · a57e811a
  jiangxiulong authored Nov 10, 2021
  
  a57e811a
- 新增修改 · 59d50061
  dongchun authored Nov 10, 2021
  
  59d50061
- revert 调整:创建券发放任务逻辑:券领取类型为`2-积分兑换`时不创建发放任务; · 4c69546b
  张国柄 authored Nov 10, 2021
  
  4c69546b
- 调整:创建券发放任务逻辑:券领取类型为`2-积分兑换`时不创建发放任务; · c6ed7c5e
  张国柄 authored Nov 10, 2021
  
  c6ed7c5e
- 调整:创建券发放任务逻辑:兑换有效期去除校验，券领取类型为`2-积分兑换`时不做校验; · d50f6b7c
  张国柄 authored Nov 10, 2021
  
  d50f6b7c
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · 0b50a4f2
  张国柄 authored Nov 10, 2021
  
  0b50a4f2
- 调整:创建券发放任务逻辑:券领取类型为`2-积分兑换`时不创建发放任务; · 033ffb1f
  张国柄 authored Nov 10, 2021
  
  033ffb1f
- 修改 bug · 184ed491
  胡佳晨 authored Nov 10, 2021
  
  184ed491
09 Nov, 2021 4 commits
- ~web.config.authority; · efea1aa1
  张国柄 authored Nov 09, 2021
  
  efea1aa1
- ~web.config.authority; · 247c2c8a
  张国柄 authored Nov 09, 2021
  
  247c2c8a
- ~config.log.level; · 071343e0
  jiangxiulong authored Nov 09, 2021
  
  071343e0
- PM临时+券发放类型：积分兑换; · fe1b257c
  张国柄 authored Nov 09, 2021
  
  fe1b257c