Commits · 6cb7f6b49ec8bb385e65e437d563eefe7a43b8c3 · 董敬伟 / liquidnet-bus-v1

15 Jan, 2022 5 commits
- 添加积分过期脚本(未完成) · 6cb7f6b4
  胡佳晨 authored Jan 15, 2022
  
  6cb7f6b4
- 添加积分过期脚本(未完成) · 7e45d6e2
  胡佳晨 authored Jan 15, 2022
  
  7e45d6e2
- 添加积分过期脚本(未完成) · a97f0398
  胡佳晨 authored Jan 15, 2022
  
  a97f0398
- 注释领取会员卡增加历史积分 · cace5056
  胡佳晨 authored Jan 15, 2022
  
  cace5056
- Merge branch 'master' into pre · 7c5488a1
  胡佳晨 authored Jan 15, 2022
  
  7c5488a1
14 Jan, 2022 2 commits
- ~config:test:xxl.admin.address; · ecbfad93
  张国柄 authored Jan 14, 2022
  
  ecbfad93
- ~config:test:xxl.admin.address; · a5d335b7
  张国柄 authored Jan 14, 2022
  
  a5d335b7
13 Jan, 2022 1 commit
- slime 获取 uid方法修改 · 8a6bc964
  胡佳晨 authored Jan 13, 2022
  
  8a6bc964
12 Jan, 2022 4 commits
- Merge branch 'pre' into 'master' · 4ab8525f
  周焕 authored Jan 12, 2022
```
删除权限

See merge request !162
```
  4ab8525f
- 删除权限 · 81a6d526
  胡佳晨 authored Jan 12, 2022
  
  81a6d526
- Merge branch 'pre' into 'master' · ad033a35
  周焕 authored Jan 12, 2022
```
修改 admin 场地审核状态bug

See merge request !161
```
  ad033a35
- 修改 admin 场地审核状态bug · 68a85e88
  胡佳晨 authored Jan 12, 2022
  
  68a85e88
10 Jan, 2022 11 commits
- Merge branch 'pre' into 'master' · b8cb97da
  周焕 authored Jan 10, 2022
```
修改快递价格

See merge request !160
```
  b8cb97da
- 修改快递价格 · e0d11a79
  胡佳晨 authored Jan 10, 2022
  
  e0d11a79
- Merge branch 'pre' into 'master' · 4791df4c
  周焕 authored Jan 10, 2022
```
修改快递价格

See merge request !159
```
  4791df4c
- 修改快递价格 · 52891943
  胡佳晨 authored Jan 10, 2022
  
  52891943
- Merge branch 'pre' into 'master' · feba10e9
  周焕 authored Jan 10, 2022
```
修改快递价格

See merge request !158
```
  feba10e9
- 修改快递价格 · ec0c0915
  胡佳晨 authored Jan 10, 2022
  
  ec0c0915
- Merge branch 'pre' into 'master' · 46517306
  周焕 authored Jan 10, 2022
```
修改快递价格

See merge request !157
```
  46517306
- 修改快递价格 · 509398d5
  胡佳晨 authored Jan 10, 2022
  
  509398d5
- Merge branch 'pre' into 'master' · 411bba32
  周焕 authored Jan 10, 2022
```
修改bug

See merge request !156
```
  411bba32
- 修改bug · 9398bdc3
  胡佳晨 authored Jan 10, 2022
  
  9398bdc3
- Merge branch 'pre' into 'master' · eda77244
  Administrator authored Jan 10, 2022
```
Pre

See merge request !155
```
  eda77244
07 Jan, 2022 14 commits
- Merge remote-tracking branch 'origin/dev_merchant' into pre · 2592588c
  jiangxiulong authored Jan 07, 2022
  
  2592588c
- Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant · bfc70e9a
  jiangxiulong authored Jan 07, 2022
  
  bfc70e9a
- 退款admin申请和取消、kylin和order的超时支付申请；更新orderTicketEntities 换方式不然导致refundPrice 更新为0... · d4ea3967
  jiangxiulong authored Jan 07, 2022
```
退款admin申请和取消、kylin和order的超时支付申请；更新orderTicketEntities 换方式 不然导致refundPrice 更新为0 因为那个vo设置了getRefundPrice方法
```
  d4ea3967
- Merge remote-tracking branch 'origin/dev_merchant' into pre · cf2262f6
  jiangxiulong authored Jan 07, 2022
  
  cf2262f6
- Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant · aabf1628
  jiangxiulong authored Jan 07, 2022
  
  aabf1628
- 运单信息 · 7b639ae5
  jiangxiulong authored Jan 07, 2022
  
  7b639ae5
- Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant · fa51982b
  jiangxiulong authored Jan 07, 2022
  
  fa51982b
- 运单信息 · f2758142
  jiangxiulong authored Jan 07, 2022
  
  f2758142
- 运单信息 · e4ecfff2
  jiangxiulong authored Jan 07, 2022
  
  e4ecfff2
- Merge remote-tracking branch 'origin/pre' into pre · ab382d9f
  张国柄 authored Jan 07, 2022
  
  ab382d9f
- ~会员信息中会员ID生成补位处理; · 0a7a2955
  张国柄 authored Jan 07, 2022
  
  0a7a2955
- Merge branch 'dev_merchant' into pre · e51facc0
  胡佳晨 authored Jan 07, 2022
  
  e51facc0
- Merge remote-tracking branch 'origin/dev_merchant' into dev_merchant · 81a4830c
  胡佳晨 authored Jan 07, 2022
  
  81a4830c
- 123 · 285ddf70
  胡佳晨 authored Jan 07, 2022
  
  285ddf70
06 Jan, 2022 3 commits
- Merge remote-tracking branch 'origin/dev_merchant' into pre · 09d37583
  jiangxiulong authored Jan 06, 2022
  
  09d37583
- Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant · 38f18543
  jiangxiulong authored Jan 06, 2022
  
  38f18543
- cityName 获取 adCode · 84a0abe9
  jiangxiulong authored Jan 06, 2022
  
  84a0abe9