Merge remote-tracking branch 'origin/master'
# Conflicts:
# pom.xml
# src/main/java/com/example/webapi/WebApiApplication.java
# src/main/java/com/example/webapi/config/SwaggerConfig.java
# src/main/java/com/example/webapi/controller/SupplyVarietyController.java
# src/main/java/com/example/webapi/controller/TransferRecordController.java
# src/main/java/com/example/webapi/controller/TransportCompanyController.java
# src/main/java/com/example/webapi/controller/TwiceWeighingController.java
# src/main/java/com/example/webapi/controller/VehicleInfoController.java
# src/main/java/com/example/webapi/controller/WeighingRecordController.java
# src/main/java/com/example/webapi/dto/TwiceWeighingQueryDTO.java
# src/main/java/com/example/webapi/entity/MaterialInfo.java
# src/main/java/com/example/webapi/entity/SupplyVariety.java
# src/main/java/com/example/webapi/entity/TransportCompany.java
# src/main/java/com/example/webapi/entity/TwiceWeighing.java
# src/main/java/com/example/webapi/entity/VehicleInfo.java
# src/main/java/com/example/webapi/entity/WeighingRecord.java
# src/main/java/com/example/webapi/repository/TwiceWeighingRepository.java
# src/main/java/com/example/webapi/service/TwiceWeighingService.java
# src/main/resources/application.yml
|