Commits · 10c7c686370089a18cad77f2f9dabb59bf792d4c · 董敬伟 / liquidnet-bus-v1

18 Apr, 2022 2 commits

修改 admin 活动名称搜索 · 10c7c686
胡佳晨 authored Apr 18, 2022

10c7c686

Merge branch 'master' into dev_kid · 5ba09ff0

胡佳晨 authored Apr 18, 2022

# Conflicts:
#	liquidnet-bus-config/liquidnet-config/application-dev.yml
#	liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/util/QueueUtils.java

5ba09ff0

15 Apr, 2022 38 commits
- Merge branch 'pre' into 'master' · b186f89d
  Administrator authored Apr 15, 2022
```
~queue;

See merge request !211
```
  b186f89d
- ~queue; · e886d089
  张国柄 authored Apr 15, 2022
  
  e886d089
- Merge branch 'pre' into 'master' · fa8810a6
  Administrator authored Apr 15, 2022
```
提交 app 搜索接口

See merge request !210
```
  fa8810a6
- 提交 app 搜索接口 · 5f7fc975
  胡佳晨 authored Apr 15, 2022
  
  5f7fc975
- Merge branch 'pre_change_galaxy' into 'master' · 101da2c5
  Administrator authored Apr 15, 2022
```
~opt;

See merge request !209
```
  101da2c5
- ~opt; · 70f0da61
  张国柄 authored Apr 15, 2022
  
  70f0da61
- Merge branch 'pre_change_galaxy' into 'master' · 55fa1f84
  Administrator authored Apr 15, 2022
```
Pre change galaxy

See merge request !208
```
  55fa1f84
- ~opt; · 810aaf93
  张国柄 authored Apr 15, 2022
  
  810aaf93
- 抽奖概率判断总概率超过100的；=0；排序 · d59d36ad
  jiangxiulong authored Apr 15, 2022
  
  d59d36ad
- ~api:藏品管理:添加藏品+概率和<100校验; · 0f0a62a9
  张国柄 authored Apr 15, 2022
  
  0f0a62a9
- ~oss; · 42a9feda
  张国柄 authored Apr 15, 2022
  
  42a9feda
- ~实名:已实名且三要素，则校验用户录入信息与已认证信息; · 236aa14b
  张国柄 authored Apr 15, 2022
  
  236aa14b
- ~实名:非三要素重新实名; · 9ead0cf0
  张国柄 authored Apr 15, 2022
  
  9ead0cf0
- ~; · 6073ccd2
  张国柄 authored Apr 15, 2022
  
  6073ccd2
- ~; · edb2a6e1
  张国柄 authored Apr 15, 2022
  
  edb2a6e1
- ~; · f51ba93b
  张国柄 authored Apr 15, 2022
  
  f51ba93b
- ~; · 20d7f7ff
  张国柄 authored Apr 15, 2022
  
  20d7f7ff
- Merge remote-tracking branch 'origin/pre_change_galaxy' into pre_change_galaxy · 5159214c
  张国柄 authored Apr 15, 2022
  
  5159214c
- ~; · 988a6ea6
  张国柄 authored Apr 15, 2022
  
  988a6ea6
- admin藏品列表 · 0db68804
  jiangxiulong authored Apr 15, 2022
  
  0db68804
- ~; · 66a135ea
  张国柄 authored Apr 15, 2022
  
  66a135ea
- Merge remote-tracking branch 'origin/pre_change_galaxy' into pre_change_galaxy · b44314f9
  张国柄 authored Apr 15, 2022
  
  b44314f9
- ~; · 5e72126e
  张国柄 authored Apr 15, 2022
  
  5e72126e
- 去掉查询线程休眠时间 · 2771b1c3
  anjiabin authored Apr 15, 2022
  
  2771b1c3
- -bean, name; · 568c6d1d
  张国柄 authored Apr 15, 2022
  
  568c6d1d
- 暂时提交代码 · a565d58d
  胡佳晨 authored Apr 15, 2022
  
  a565d58d
- Merge branch 'pre' into pre_change_galaxy · c7f85720
  胡佳晨 authored Apr 15, 2022
  
  c7f85720
- 修改kylin消费配置 · cc99fcb2
  anjiabin authored Apr 15, 2022
  
  cc99fcb2
- -goblin调用adam同步数字账号逻辑; · 341cdb7e
  张国柄 authored Apr 15, 2022
  
  341cdb7e
- ~goblin+数字账号开通逻辑; · 9a109820
  张国柄 authored Apr 15, 2022
  
  9a109820
- Merge remote-tracking branch 'origin/pre' into pre · 0830421d
  jiangxiulong authored Apr 15, 2022
  
  0830421d
- expireTime 10 · a08cab2d
  jiangxiulong authored Apr 15, 2022
  
  a08cab2d
- 暂时提交代码 · 1d62a79e
  胡佳晨 authored Apr 15, 2022
  
  1d62a79e
- ~去除数字账号开通逻辑; · 267f1ac4
  张国柄 authored Apr 15, 2022
  
  267f1ac4
- 暂时提交代码 · 2a18a3a9
  胡佳晨 authored Apr 15, 2022
  
  2a18a3a9
- 暂时提交代码 · 65733cfa
  胡佳晨 authored Apr 15, 2022
  
  65733cfa
- 暂时提交代码 · 31e8acc6
  胡佳晨 authored Apr 15, 2022
  
  31e8acc6
- 暂时提交代码 · baa6da69
  胡佳晨 authored Apr 15, 2022
  
  baa6da69