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

27 Sep, 2021 2 commits
- Merge remote-tracking branch 'origin/template_message' into template_message · 0b2f8466
  jiangxiulong authored Sep 27, 2021
  
  0b2f8466
- 大美 catch · 8a8c01d6
  jiangxiulong authored Sep 27, 2021
  
  8a8c01d6
26 Sep, 2021 3 commits
- import com.liquidnet.service.kylin.utils.ObjectUtil; · 2e3694dc
  jiangxiulong authored Sep 26, 2021
  
  2e3694dc
- Merge remote-tracking branch 'origin/master' into template_message · 034e8984
  jiangxiulong authored Sep 26, 2021
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
```
  034e8984
- Merge branch 'pre' into 'master' · 05cd0fb5
  刘喆 authored Sep 26, 2021
```
超时支付 不会滚库存

See merge request !48
```
  05cd0fb5
25 Sep, 2021 1 commit
- 超时支付不会滚库存 · dc0f983f
  胡佳晨 authored Sep 25, 2021
  
  dc0f983f
24 Sep, 2021 5 commits
- Merge branch 'pre' into 'master' · cf4e8d86
  刘喆 authored Sep 24, 2021
```
Pre

See merge request !47
```
  cf4e8d86
- 增加大麦同步日志 · 7a88519b
  胡佳晨 authored Sep 24, 2021
```
修改 大麦数据查询
```
  7a88519b
- 增加大麦同步日志 · 3a1b2faf
  胡佳晨 authored Sep 24, 2021
```
修改 大麦数据查询
```
  3a1b2faf
- 增加大麦同步日志 · 060372ce
  胡佳晨 authored Sep 24, 2021
```
修改 大麦数据查询
```
  060372ce
- 增加大麦同步日志 · 6859aa68
  胡佳晨 authored Sep 24, 2021
```
修改 大麦数据查询
```
  6859aa68
23 Sep, 2021 15 commits
- Merge branch 'pre' into 'master' · 1a4c322a
  周焕 authored Sep 23, 2021
```
testAdam 写死bug 修复

See merge request !46
```
  1a4c322a
- testAdam 写死bug 修复 · 653f3914
  胡佳晨 authored Sep 23, 2021
  
  653f3914
- Merge branch 'pre' into 'master' · 064f8932
  周焕 authored Sep 23, 2021
```
Pre

See merge request !45
```
  064f8932
- 订单已实名不可更改 · 2f6dc3ce
  胡佳晨 authored Sep 23, 2021
  
  2f6dc3ce
- 增加入库 · 875642d6
  胡佳晨 authored Sep 23, 2021
  
  875642d6
- 增加入库 · 085a4042
  胡佳晨 authored Sep 23, 2021
  
  085a4042
- 增加入库 · 99984ded
  胡佳晨 authored Sep 23, 2021
  
  99984ded
- 增加入库 · 7a34d187
  胡佳晨 authored Sep 23, 2021
  
  7a34d187
- Merge branch 'master' into dev_fix_true_name · 279ab9b8
  胡佳晨 authored Sep 23, 2021
  
  279ab9b8
- Merge branch 'pre' into 'master' · 2a93dc3d
  Administrator authored Sep 23, 2021
```
修改 大麦导入

See merge request !44
```
  2a93dc3d
- reset · 887c2573
  jiangxiulong authored Sep 23, 2021
  
  887c2573
- sweet add api do · 1ec2d4bf
  jiangxiulong authored Sep 23, 2021
  
  1ec2d4bf
- 修改大麦导入 · 233f369c
  胡佳晨 authored Sep 23, 2021
  
  233f369c
- 消息模板 · 8623bd68
  胡佳晨 authored Sep 23, 2021
  
  8623bd68
- 演出实名若订单未实名则需要实名 · 0f6f72c0
  胡佳晨 authored Sep 23, 2021
  
  0f6f72c0
22 Sep, 2021 14 commits
- 模板 · f02486ec
  胡佳晨 authored Sep 22, 2021
  
  f02486ec
- openId 空直接返回true · 7e2e8111
  jiangxiulong authored Sep 22, 2021
  
  7e2e8111
- 自己查询openid · c79b4798
  jiangxiulong authored Sep 22, 2021
  
  c79b4798
- Merge remote-tracking branch 'origin/template_message' into template_message · 8e890a32
  jiangxiulong authored Sep 22, 2021
  
  8e890a32
- 模板 · 99792163
  胡佳晨 authored Sep 22, 2021
  
  99792163
- add phone · 683ff614
  jiangxiulong authored Sep 22, 2021
  
  683ff614
- add phone · 86293e3b
  jiangxiulong authored Sep 22, 2021
  
  86293e3b
- del 没有的代码 · 60885c98
  jiangxiulong authored Sep 22, 2021
  
  60885c98
- del 没有的代码 · 3240349a
  jiangxiulong authored Sep 22, 2021
  
  3240349a
- consumer sweet add template message · 14a58dc2
  jiangxiulong authored Sep 22, 2021
  
  14a58dc2
- consumer sweet add template message · e4522b19
  jiangxiulong authored Sep 22, 2021
  
  e4522b19
- Merge branch 'pre' into 'master' · 11c0e077
  Administrator authored Sep 22, 2021
```
改 sweet 大麦同步

See merge request !43
```
  11c0e077
- 改 sweet 大麦同步 · de84ac53
  胡佳晨 authored Sep 22, 2021
  
  de84ac53
- Merge branch 'pre' into 'master' · 4e7a06d4
  Administrator authored Sep 22, 2021
```
Pre

See merge request !42
```
  4e7a06d4