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

24 Nov, 2021 1 commit

Merge branch 'pre' into jxl_1115_refund · ee43862d

jiangxiulong authored Nov 24, 2021

# Conflicts:
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java

ee43862d

23 Nov, 2021 1 commit
- test redis config · fef2639d
  jiangxiulong authored Nov 23, 2021
  
  fef2639d
22 Nov, 2021 36 commits
- Merge remote-tracking branch 'origin/dev_20111115' into pre · b18a4e12
  张国柄 authored Nov 22, 2021
  
  b18a4e12
- fix:bean init; · 59859c0d
  张国柄 authored Nov 22, 2021
  
  59859c0d
- Merge remote-tracking branch 'origin/pre' into pre · b0b2d6f9
  jiangxiulong authored Nov 22, 2021
  
  b0b2d6f9
- config · 57b71e75
  jiangxiulong authored Nov 22, 2021
  
  57b71e75
- Merge remote-tracking branch 'origin/dev_20111115' into pre · ef889347
  anjiabin authored Nov 22, 2021
  
  ef889347
- 支付处理openid为error问题-暂时前端处理 · 26f20494
  anjiabin authored Nov 22, 2021
  
  26f20494
- Merge branch 'dev_20111115' into pre · eed1ea3d
  jiangxiulong authored Nov 22, 2021
  
  eed1ea3d
- add try · 8b87b9e3
  jiangxiulong authored Nov 22, 2021
  
  8b87b9e3
- Merge remote-tracking branch 'origin/pre' into pre · 1cda8e0a
  张国柄 authored Nov 22, 2021
  
  1cda8e0a
- ~config; · 8a2b2e73
  张国柄 authored Nov 22, 2021
  
  8a2b2e73
- cityVote · bcbfdc3b
  jiangxiulong authored Nov 22, 2021
  
  bcbfdc3b
- 提交单条的 · 41415485
  胡佳晨 authored Nov 22, 2021
  
  41415485
- 提交单条的 · 1fa8f8e5
  胡佳晨 authored Nov 22, 2021
  
  1fa8f8e5
- 修改数据库文件 · cfa3083f
  胡佳晨 authored Nov 22, 2021
  
  cfa3083f
- 修改权限 · ab55ded1
  胡佳晨 authored Nov 22, 2021
  
  ab55ded1
- +log; · 499187a2
  张国柄 authored Nov 22, 2021
  
  499187a2
- fix:reg im; · 5d709780
  张国柄 authored Nov 22, 2021
  
  5d709780
- 修改脚本 · 93e77b26
  胡佳晨 authored Nov 22, 2021
  
  93e77b26
- 修改脚本 · 9cb23c7b
  胡佳晨 authored Nov 22, 2021
  
  9cb23c7b
- 修改脚本 · bd68b976
  胡佳晨 authored Nov 22, 2021
  
  bd68b976
- 修改脚本 · f1bf9426
  胡佳晨 authored Nov 22, 2021
  
  f1bf9426
- 修改脚本 · bf0c5082
  胡佳晨 authored Nov 22, 2021
  
  bf0c5082
- 90081 · bdbdcdb6
  jiangxiulong authored Nov 22, 2021
  
  bdbdcdb6
- log · 6f663071
  jiangxiulong authored Nov 22, 2021
  
  6f663071
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · e75cc712
  jiangxiulong authored Nov 22, 2021
  
  e75cc712
- XML · 67678ce3
  jiangxiulong authored Nov 22, 2021
  
  67678ce3
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · 51cf6058
  张国柄 authored Nov 22, 2021
  
  51cf6058
- ~config; · 1cb41705
  张国柄 authored Nov 22, 2021
  
  1cb41705
- push test · 0cc231bb
  jiangxiulong authored Nov 22, 2021
  
  0cc231bb
- +.test; · c63554cc
  张国柄 authored Nov 22, 2021
  
  c63554cc
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · 9c5a2262
  jiangxiulong authored Nov 22, 2021
  
  9c5a2262
- add type · 42a42506
  jiangxiulong authored Nov 22, 2021
  
  42a42506
- opt:config; · 4aed3183
  张国柄 authored Nov 22, 2021
  
  4aed3183
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · 88af985a
  jiangxiulong authored Nov 22, 2021
  
  88af985a
- 同步mysql增加mapper · a9986c5c
  jiangxiulong authored Nov 22, 2021
  
  a9986c5c
- Merge branch 'master_压测' into dev_20111115 · 89a84494
  胡佳晨 authored Nov 22, 2021
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java
```
  89a84494
19 Nov, 2021 2 commits
- in2112 apply · 974ca8e5
  jiangxiulong authored Nov 19, 2021
  
  974ca8e5
- 2112 · c13188af
  胡佳晨 authored Nov 19, 2021
  
  c13188af