Commits · bf8dc9ea687ce70fd25d67d6d40cd2470cac90b5 · 董敬伟 / liquidnet-bus-v1 · GitLab

记得上下班打卡 | git大法好，push需谨慎

10 Nov, 2021 14 commits
- 修改前端之前数据渲染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 26 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
- PM临时+券发放类型：积分兑换; · e00a7329
  张国柄 authored Nov 09, 2021
  
  e00a7329
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · db74e1d0
  张国柄 authored Nov 09, 2021
  
  db74e1d0
- tag:停用stone.ssovalid; · 3f56deab
  张国柄 authored Nov 09, 2021
  
  3f56deab
- getUnionIdByPhone 大美同步数据 · 65478996
  jiangxiulong authored Nov 09, 2021
  
  65478996
- 退款列表排序 · 34032ef9
  jiangxiulong authored Nov 09, 2021
  
  34032ef9
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · 9dae5546
  jiangxiulong authored Nov 09, 2021
  
  9dae5546
- 退款列表操作刷新保留筛选条件 · a0a256bc
  jiangxiulong authored Nov 09, 2021
  
  a0a256bc
- fix · a0b22fa0
  张国柄 authored Nov 09, 2021
  
  a0b22fa0
- revert 暂时停用stone.ssovalid; · 1ba3c509
  张国柄 authored Nov 09, 2021
  
  1ba3c509
- 暂时停用stone.ssovalid; · 2cc71ab0
  张国柄 authored Nov 09, 2021
  
  2cc71ab0
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · 92edfaed
  张国柄 authored Nov 09, 2021
  
  92edfaed
- opt:pom; · 28e5a98e
  张国柄 authored Nov 09, 2021
  
  28e5a98e
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · e1fefbec
  jiangxiulong authored Nov 09, 2021
  
  e1fefbec
- 快递相关列表排序 · 96e33bde
  jiangxiulong authored Nov 09, 2021
  
  96e33bde
- 订单回调修改队列改为和创建一起 · b438377a
  胡佳晨 authored Nov 09, 2021
  
  b438377a
- 打印快递单弹窗增加订单数量购票数量未购票的票种不展示 · 1ffd9705
  jiangxiulong authored Nov 09, 2021
  
  1ffd9705
- sweet include-url-pattern · 46ac8490
  jiangxiulong authored Nov 09, 2021
  
  46ac8490
- 票种完善打印mid完善退款详情俩个显示互换 · 0a8937c7
  jiangxiulong authored Nov 09, 2021
  
  0a8937c7
- Merge remote-tracking branch 'origin/dev_mcode_mgt' into dev_20111115 · c69aa367
  张国柄 authored Nov 09, 2021
  
  c69aa367
- ~config:logging.level; · 1149a88a
  张国柄 authored Nov 09, 2021
  
  1149a88a
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · fa500773
  张国柄 authored Nov 09, 2021
  
  fa500773
- revert: yace.redis.config; · adf5cff2
  张国柄 authored Nov 09, 2021
  
  adf5cff2