# Conflicts: # application.pid # src/main/java/com/qtzl/alterSales/dao/repo/jpa/third/EtcOrderVehicleInfoRepo.java
# Conflicts: # src/test/java/SaleTest.java