Commits · 449d16d74ef0de73aff7fa8121b7b3610857b961 · 董敬伟 / liquidnet-bus-v1

28 Dec, 2021 30 commits
- Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant · 449d16d7
  jiangxiulong authored Dec 28, 2021
  
  449d16d7
- produce_code · bed98d7d
  jiangxiulong authored Dec 28, 2021
  
  bed98d7d
- Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant · 0bc4ef4f
  jiangxiulong authored Dec 28, 2021
  
  0bc4ef4f
- 快递方式快递产品 · 7d02cfca
  jiangxiulong authored Dec 28, 2021
  
  7d02cfca
- 快递方式快递产品 · 2415c808
  jiangxiulong authored Dec 28, 2021
  
  2415c808
- 增加快递类型 · 927f0f1e
  胡佳晨 authored Dec 28, 2021
  
  927f0f1e
- Merge remote-tracking branch 'origin/dev_merchant' into dev_merchant · 11fa8970
  胡佳晨 authored Dec 28, 2021
  
  11fa8970
- 正在下单 admin配置 · a1063b08
  胡佳晨 authored Dec 28, 2021
  
  a1063b08
- Merge remote-tracking branch 'origin/dev_merchant' into dev_merchant · 2b6d5098
  jiangxiulong authored Dec 28, 2021
  
  2b6d5098
- Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant · efe4cdd4
  jiangxiulong authored Dec 28, 2021
  
  efe4cdd4
- 快递方式 · 3fcc61e6
  jiangxiulong authored Dec 28, 2021
  
  3fcc61e6
- Merge remote-tracking branch 'origin/dev_merchant' into dev_merchant · e9860a4c
  胡佳晨 authored Dec 28, 2021
  
  e9860a4c
- 正在下单 admin配置 · 4f0f2235
  胡佳晨 authored Dec 28, 2021
  
  4f0f2235
- test express · 1ed9d47b
  jiangxiulong authored Dec 28, 2021
  
  1ed9d47b
- Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant · 2cfb5543
  jiangxiulong authored Dec 28, 2021
  
  2cfb5543
- 快递方式 · 82e85c44
  jiangxiulong authored Dec 28, 2021
  
  82e85c44
- 正在下单 admin配置 · ee997041
  胡佳晨 authored Dec 28, 2021
  
  ee997041
- 正在下单 admin配置 · aeb6bf01
  胡佳晨 authored Dec 28, 2021
  
  aeb6bf01
- merge 多 · 3c5dd39b
  jiangxiulong authored Dec 28, 2021
  
  3c5dd39b
- 暂时提交 · dd976428
  胡佳晨 authored Dec 28, 2021
  
  dd976428
- 暂时提交 · 77c7df39
  胡佳晨 authored Dec 28, 2021
  
  77c7df39
- Merge remote-tracking branch 'origin/dev_freight' into dev_merchant · 4c799e27
  胡佳晨 authored Dec 28, 2021
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinGetShunFengPriceController.java
```
  4c799e27
- 修改复制bug · e7e33056
  胡佳晨 authored Dec 28, 2021
  
  e7e33056
- Merge remote-tracking branch 'origin/dev_merchant' into dev_merchant · fbd2cc13
  胡佳晨 authored Dec 28, 2021
  
  fbd2cc13
- 修改复制bug · 11f14f1a
  胡佳晨 authored Dec 28, 2021
  
  11f14f1a
- merge 多 · bac2ee91
  jiangxiulong authored Dec 28, 2021
  
  bac2ee91
- Merge branch 'jxl_1214_refund' into dev_merchant · 92a9889c
  jiangxiulong authored Dec 28, 2021
```
# Conflicts:
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinExpressModuleController.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java
#	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinExpressModule.java
#	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinExpressModuleMapper.java
#	liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/PlatformTaskHandler.java
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_20211115_express_refund.sql
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinExpressModuleController.java
```
  92a9889c
- Merge remote-tracking branch 'origin/master' into jxl_1214_refund · bae6ea6c
  jiangxiulong authored Dec 28, 2021
  
  bae6ea6c
- 运费为0元时返23元 · 65ab5603
  sunyuntian authored Dec 28, 2021
  
  65ab5603
- 修改快递类型需要审核 · 9b57a921
  胡佳晨 authored Dec 28, 2021
  
  9b57a921
27 Dec, 2021 3 commits
- 增加mysql索引 · cbee5d88
  jiangxiulong authored Dec 27, 2021
  
  cbee5d88
- Merge branch 'pre' into 'master' · d79c1cca
  Administrator authored Dec 27, 2021
```
删除最后一个

See merge request !149
```
  d79c1cca
- 删除最后一个 · bb9017ef
  jiangxiulong authored Dec 27, 2021
  
  bb9017ef
24 Dec, 2021 7 commits
- Merge remote-tracking branch 'origin/master' into dev_merchant · 4861c69e
  张国柄 authored Dec 24, 2021
```
# Conflicts:
#	liquidnet-bus-config/liquidnet-config/application-dev.yml
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
```
  4861c69e
- Merge branch 'pre' into 'master' · cc7e2517
  Administrator authored Dec 24, 2021
```
Pre

See merge request !148
```
  cc7e2517
- createIndex · 35e56d6b
  jiangxiulong authored Dec 24, 2021
  
  35e56d6b
- 修改上传二维码逻辑 · 9f4118ab
  胡佳晨 authored Dec 24, 2021
  
  9f4118ab
- Merge branch 'master' into dev_qrCode_wechat · cfc26285
  胡佳晨 authored Dec 24, 2021
  
  cfc26285
- 修改上传二维码逻辑 · 4a0164c8
  胡佳晨 authored Dec 24, 2021
  
  4a0164c8
- Merge branch 'pre' into 'master' · f65081e2
  Administrator authored Dec 24, 2021
```
Pre

See merge request !147
```
  f65081e2