You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
pref_mail@163.com
de2726690a
Merge branch 'dev' into dist.1.2.0
# Conflicts:
# blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java
# blade-service/logpm-distribution/pom.xml
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionLoadscanService.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionLoadscanServiceImpl.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
|
4 months ago |
.. |
application-dev.yml
|
add:
|
5 months ago |
application-prod.yml
|
fix:去除掉seata的配置启动数据库配置
|
9 months ago |
application-test.yml
|
add:
|
5 months ago |
application.yml
|
fix:q去除无效的配置
|
10 months ago |
logback.xml
|
1.修改日志保存文件
|
1 year ago |