Commits · 5f17bfdc5eff7ce8eb09a0fd573482be16379048 · 董敬伟 / liquidnet-bus-v1

18 Oct, 2021 12 commits
- Merge branch 'pre' into 'master' · 5f17bfdc
  Administrator authored Oct 18, 2021
```
Pre

See merge request !88
```
  5f17bfdc
- Merge branch 'jxl_1018_active' into pre · be643502
  jiangxiulong authored Oct 18, 2021
  
  be643502
- Merge branch 'jxl_1018_expressStatus' into pre · 68d6fc30
  jiangxiulong authored Oct 18, 2021
  
  68d6fc30
- Merge branch 'master' into change_candy_bug · 54e6b401
  胡佳晨 authored Oct 18, 2021
  
  54e6b401
- 快递状态增加8000的处理 · 22101ef7
  jiangxiulong authored Oct 18, 2021
  
  22101ef7
- admin 工具类增加修改订单入场人 · 46c8de7d
  胡佳晨 authored Oct 18, 2021
  
  46c8de7d
- list default 1 · d2c358c0
  jiangxiulong authored Oct 18, 2021
  
  d2c358c0
- 投票活动增加type · d570e0fb
  jiangxiulong authored Oct 18, 2021
  
  d570e0fb
- 二审 to 财务审核 · bbc0faea
  jiangxiulong authored Oct 18, 2021
  
  bbc0faea
- express_type 2 · 983f432d
  jiangxiulong authored Oct 18, 2021
  
  983f432d
- express_status to smallint · 9323a129
  jiangxiulong authored Oct 18, 2021
  
  9323a129
- 同步大麦修改 · 041ee44f
  胡佳晨 authored Oct 18, 2021
  
  041ee44f
15 Oct, 2021 23 commits
- Merge branch 'k8s-test' into 'master' · 71ae8f3f
  刘喆 authored Oct 15, 2021
```
K8s test

See merge request !87
```
  71ae8f3f
- Update pom.xml · 05084e9d
  刘喆 authored Oct 15, 2021
  
  05084e9d
- Update liquidnet-service-order-k8s-test.yml · 52bddef0
  刘喆 authored Oct 15, 2021
  
  52bddef0
- fix:券使用后状态值更正[3 -> 5]; · 915382e4
  张国柄 authored Oct 15, 2021
  
  915382e4
- Delete bootstrap-k8s-test.yml · 71c50c61
  刘喆 authored Oct 15, 2021
  
  71c50c61
- Add new file · 25866b42
  刘喆 authored Oct 15, 2021
  
  25866b42
- Merge branch 'pre' into 'k8s-test' · e42033b7
  刘喆 authored Oct 15, 2021
```
Pre

See merge request !86
```
  e42033b7
- Update pom.xml · ac35561f
  刘喆 authored Oct 15, 2021
  
  ac35561f
- Update pom.xml · 577e89cd
  刘喆 authored Oct 15, 2021
  
  577e89cd
- Update pom.xml · b1091f94
  刘喆 authored Oct 15, 2021
  
  b1091f94
- Update pom.xml · 3b235e68
  刘喆 authored Oct 15, 2021
  
  3b235e68
- fix:maven config; · 928b8352
  张国柄 authored Oct 15, 2021
  
  928b8352
- Merge branch 'pre' into 'master' · 65337b70
  刘喆 authored Oct 15, 2021
```
Pre

See merge request !85
```
  65337b70
- Merge branch 'pre' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into pre · 79482ac8
  anjiabin authored Oct 15, 2021
  
  79482ac8
- 提交chime社交相关-修改排序 · 1311547f
  anjiabin authored Oct 15, 2021
  
  1311547f
- 修改商品返回可用演出券反之同理的bug · 021ea2f3
  胡佳晨 authored Oct 15, 2021
  
  021ea2f3
- Merge branch 'new_member' into pre · a7a33822
  jiangxiulong authored Oct 15, 2021
  
  a7a33822
- add log · ec1a381f
  jiangxiulong authored Oct 15, 2021
  
  ec1a381f
- 提交chime社交相关-修改排序 · 03778213
  anjiabin authored Oct 15, 2021
  
  03778213
- 修改下拉框显示不全问题 · 6e05b19b
  dongchun authored Oct 15, 2021
  
  6e05b19b
- 下单借口判断券下移到try · 506ea472
  胡佳晨 authored Oct 15, 2021
  
  506ea472
- 修复 bugdone 周焕王斐提交的bug · 66c9c5ca
  胡佳晨 authored Oct 15, 2021
  
  66c9c5ca
- 修复 bugdone 周焕王斐提交的bug · 994667a8
  胡佳晨 authored Oct 15, 2021
  
  994667a8
14 Oct, 2021 5 commits
- Merge branch 'pre' into 'k8s-test' · bcac5047
  刘喆 authored Oct 14, 2021
```
Pre

See merge request !84
```
  bcac5047
- Merge branch 'pre' into 'master' · 8a2b65ed
  Administrator authored Oct 14, 2021
```
Pre

See merge request !83
```
  8a2b65ed
- Merge remote-tracking branch 'origin/pre' into pre · b71733aa
  jiangxiulong authored Oct 14, 2021
  
  b71733aa
- sql 优化 · b6745d61
  jiangxiulong authored Oct 14, 2021
  
  b6745d61
- Merge branch 'pre' into 'k8s-test' · a8fdaf50
  刘喆 authored Oct 14, 2021
```
Pre

See merge request !82
```
  a8fdaf50