Commits · 0b50a4f23f7e6755b6dda8607331bfdb9cfc43bd · 董敬伟 / liquidnet-bus-v1

10 Nov, 2021 3 commits
- 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
08 Nov, 2021 11 commits
- 快递管理演出订单列表增加购票数量、搜索增加票种搜索 · c8d61af4
  jiangxiulong authored Nov 08, 2021
  
  c8d61af4
- noticeList type存在时候只展示一个演出 · 7a8ad304
  jiangxiulong authored Nov 08, 2021
  
  7a8ad304
- 演出状态 11的判断排除下架7的时候不处理 · e5b33623
  jiangxiulong authored Nov 08, 2021
  
  e5b33623
- Merge branch 'dev_stone' into dev_20111115 · 1594c13d
  jiangxiulong authored Nov 08, 2021
  
  1594c13d
- +config:yace; · 53fbcc4a
  张国柄 authored Nov 08, 2021
  
  53fbcc4a
- 同步applet user · 0063db0b
  jiangxiulong authored Nov 08, 2021
  
  0063db0b
- 用户常住地兼容处理; · d27c4fe4
  张国柄 authored Nov 08, 2021
  
  d27c4fe4
- 用户常住地兼容处理; · 025ee4fe
  张国柄 authored Nov 08, 2021
  
  025ee4fe
- fix · 5a83fd0a
  张国柄 authored Nov 08, 2021
  
  5a83fd0a
- Merge remote-tracking branch 'origin/dev_user_area' into dev_20111115 · 4112403b
  张国柄 authored Nov 08, 2021
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql
#	liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java
```
  4112403b
- +单点登录验证指定URI处理; · b3493b3d
  张国柄 authored Nov 08, 2021
  
  b3493b3d