# Conflicts: # wm-production/pom.xml # wm-production/src/main/java/com/water/production/controller/QualityLedgerController.java # wm-production/src/main/java/com/water/production/dto/QualityQueryRequest.java # wm-production/src/main/java/com/water/production/dto/QualityStatVO.java # wm-production/src/main/java/com/water/production/entity/QualityStandard.java # wm-production/src/main/java/com/water/production/entity/QualityTestPlan.java # wm-production/src/main/java/com/water/production/entity/QualityTestRecord.java # wm-production/src/main/java/com/water/production/mapper/QualityTestRecordMapper.java # wm-production/src/main/java/com/water/production/service/QualityLedgerService.java # wm-production/src/main/java/com/water/production/service/QualityStandardService.java # wm-production/src/main/java/com/water/production/service/QualityTestPlanService.java # wm-production/src/main/resources/db/V4__quality_ledger.sql # wm-production/src/main/resources/mapper/QualityTestRecordMapper.xml # wm-production/src/test/java/com/water/production/service/QualityLedgerServiceTest.java
bot_dev2
8e1b9d8dd2
Merge remote-tracking branch 'origin/feature/issue-66'