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

18 Oct, 2021 40 commits
- Merge branch 'pre' into 'master' · a8f5cb77
  Administrator authored Oct 18, 2021
```
Pre

See merge request !92
```
  a8f5cb77
- Merge remote-tracking branch 'origin/master' into jxl_1018_expressStatus · 586aa1cb
  jiangxiulong authored Oct 18, 2021
  
  586aa1cb
- Merge branch 'k8s-test' into 'master' · 14b3572a
  刘喆 authored Oct 18, 2021
```
Update bootstrap.yml

See merge request !91
```
  14b3572a
- 快递 send_type · cb31c53c
  jiangxiulong authored Oct 18, 2021
  
  cb31c53c
- Update bootstrap.yml · b4175a8a
  刘喆 authored Oct 18, 2021
  
  b4175a8a
- Merge remote-tracking branch 'origin/master' into jxl_1018_expressStatus · 5056eed3
  jiangxiulong authored Oct 18, 2021
  
  5056eed3
- 快递 · e4595bbd
  jiangxiulong authored Oct 18, 2021
  
  e4595bbd
- Merge branch 'k8s-test' into 'master' · 969a21e9
  刘喆 authored Oct 18, 2021
```
K8s test

See merge request !90
```
  969a21e9
- Update application-test.yml · bcec26ab
  刘喆 authored Oct 18, 2021
  
  bcec26ab
- Update bootstrap-test.yml · 8dc2175f
  刘喆 authored Oct 18, 2021
  
  8dc2175f
- Update application-test.yml · 8fd3f8e9
  刘喆 authored Oct 18, 2021
  
  8fd3f8e9
- Update application-test.yml · d79ef964
  刘喆 authored Oct 18, 2021
  
  d79ef964
- Update application-test.yml · bcc29baa
  刘喆 authored Oct 18, 2021
  
  bcc29baa
- Update bootstrap-test.yml · e9024107
  刘喆 authored Oct 18, 2021
  
  e9024107
- Update bootstrap-test.yml · 9482ee29
  刘喆 authored Oct 18, 2021
  
  9482ee29
- Update bootstrap-test.yml · c81bcebb
  刘喆 authored Oct 18, 2021
  
  c81bcebb
- Update bootstrap-test.yml · 30cb8604
  刘喆 authored Oct 18, 2021
  
  30cb8604
- Update bootstrap-test.yml · 12012e2e
  刘喆 authored Oct 18, 2021
  
  12012e2e
- Update bootstrap-test.yml · e757230e
  刘喆 authored Oct 18, 2021
  
  e757230e
- Update bootstrap-test.yml · f855c726
  刘喆 authored Oct 18, 2021
  
  f855c726
- Update bootstrap-test.yml · c3b0ed7e
  刘喆 authored Oct 18, 2021
  
  c3b0ed7e
- Update bootstrap-test.yml · 540692aa
  刘喆 authored Oct 18, 2021
  
  540692aa
- Update bootstrap-test.yml · 84a99bdc
  刘喆 authored Oct 18, 2021
  
  84a99bdc
- Update bootstrap-test.yml · d675852d
  刘喆 authored Oct 18, 2021
  
  d675852d
- Update bootstrap-test.yml · 1291f575
  刘喆 authored Oct 18, 2021
  
  1291f575
- Update bootstrap-test.yml · a8a6a72e
  刘喆 authored Oct 18, 2021
  
  a8a6a72e
- Merge branch 'pre' into 'master' · 4caa5244
  Administrator authored Oct 18, 2021
```
Pre

See merge request !89
```
  4caa5244
- Merge remote-tracking branch 'origin/master' into jxl_1018_active · bc3803c1
  jiangxiulong authored Oct 18, 2021
  
  bc3803c1
- redis · c6368e27
  jiangxiulong authored Oct 18, 2021
  
  c6368e27
- 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