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
de28699e78
Merge branch 'fix_bug_2024-01-22' into dev
# Conflicts:
# blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java
# blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
|
1 year ago |
.. |
src
|
Merge branch 'fix_bug_2024-01-22' into dev
|
1 year ago |
Dockerfile
|
1.修改dockerfile
|
1 year ago |
pom.xml
|
1.去除mq
|
1 year ago |