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

24 Mar, 2022 10 commits
- 修改计算比例 · cc3d3992
  zhengfuxin authored Mar 24, 2022
  
  cc3d3992
- 计算代理抽成。 · 859ef844
  zhengfuxin authored Mar 24, 2022
  
  859ef844
- 修改演出详情票提数据 · d59406f4
  GaoHu authored Mar 24, 2022
  
  d59406f4
- smile_user SQL修改 · 717e09fa
  GaoHu authored Mar 24, 2022
  
  717e09fa
- 修改用户redis储存内容，修改演出总数据计算，单票收入=单价*(总代票提+抽成票提）*数量 · 3f94e6bd
  GaoHu authored Mar 24, 2022
  
  3f94e6bd
- 修改代理相关数据存储 · 46f98d6d
  胡佳晨 authored Mar 24, 2022
  
  46f98d6d
- exit SmileUserVO · aac84974
  GaoHu authored Mar 24, 2022
  
  aac84974
- 1 · 6dbd52cf
  胡佳晨 authored Mar 24, 2022
  
  6dbd52cf
- 修改接口文档，学校改为全部存储修改组织详情获取接口异常 · e4ab95af
  GaoHu authored Mar 24, 2022
  
  e4ab95af
- 修改接口文档，学校改为全部存储修改组织详情获取接口异常 · 2c439277
  GaoHu authored Mar 24, 2022
  
  2c439277
23 Mar, 2022 26 commits
- 添加代理管理模块 · 93bb93c5
  liuran authored Mar 23, 2022
  
  93bb93c5
- exit sql · 4182f8cf
  GaoHu authored Mar 23, 2022
  
  4182f8cf
- Merge remote-tracking branch 'origin/dev-smile' into dev-smile · f1cef3a7
  GaoHu authored Mar 23, 2022
  
  f1cef3a7
- exit school and show getList · d1279691
  GaoHu authored Mar 23, 2022
  
  d1279691
- 添加代理管理模块 · 5f57229b
  liuran authored Mar 23, 2022
  
  5f57229b
- exit lSet · 477591f7
  GaoHu authored Mar 23, 2022
  
  477591f7
- 修改验证。 · deba8015
  zhengfuxin authored Mar 23, 2022
  
  deba8015
- exit return area.json · f95fa375
  GaoHu authored Mar 23, 2022
  
  f95fa375
- Merge remote-tracking branch 'origin/dev-smile' into dev-smile · 4cc807de
  GaoHu authored Mar 23, 2022
  
  4cc807de
- exit · 45e66bb6
  GaoHu authored Mar 23, 2022
  
  45e66bb6
- 改bug · d4414eee
  zhengfuxin authored Mar 23, 2022
  
  d4414eee
- exit · 19efe38b
  GaoHu authored Mar 23, 2022
  
  19efe38b
- exit · 07661be5
  GaoHu authored Mar 23, 2022
  
  07661be5
- exit · eef68b3b
  GaoHu authored Mar 23, 2022
  
  eef68b3b
- exit · 27f87760
  GaoHu authored Mar 23, 2022
  
  27f87760
- Merge remote-tracking branch 'origin/dev-smile' into dev-smile · cbf596e6
  GaoHu authored Mar 23, 2022
  
  cbf596e6
- exit return agentList · dbd601ac
  GaoHu authored Mar 23, 2022
  
  dbd601ac
- 修改smile 配置 · 85d07622
  zhengfuxin authored Mar 23, 2022
  
  85d07622
- exit · 96f2bd49
  GaoHu authored Mar 23, 2022
  
  96f2bd49
- exit · 331de1f6
  GaoHu authored Mar 23, 2022
  
  331de1f6
- 提交 smlie 的dev文件 · d42719b9
  胡佳晨 authored Mar 23, 2022
  
  d42719b9
- 提交 smlie 的dev文件 · bd0fc90a
  胡佳晨 authored Mar 23, 2022
  
  bd0fc90a
- exit show · b116ebb5
  GaoHu authored Mar 23, 2022
  
  b116ebb5
- Merge branch 'master' into dev-smile · e9e3c380
  zhengfuxin authored Mar 23, 2022
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
```
  e9e3c380
- 修改smile test环境配置。 · 53596a4b
  zhengfuxin authored Mar 23, 2022
  
  53596a4b
- exit · 667d55c9
  GaoHu authored Mar 23, 2022
  
  667d55c9
22 Mar, 2022 4 commits
- exit · 6ccbc7bf
  GaoHu authored Mar 22, 2022
  
  6ccbc7bf
- exit · 431a92e3
  GaoHu authored Mar 22, 2022
  
  431a92e3
- 修改bug · 1634ab34
  zhengfuxin authored Mar 22, 2022
  
  1634ab34
- Merge branch 'pre' into 'master' · 447ae015
  周焕 authored Mar 22, 2022
```
ÅPre

See merge request !198
```
  447ae015