ll
57b5415405
# Conflicts: # zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScDryMilkController.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScSheepDeathController.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScSheepDeath.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScDryMilkMapper.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScSheepDeathMapper.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScWeanRecordMapper.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScDryMilkService.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScSheepDeathService.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScWeanRecordService.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScDryMilkServiceImpl.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScSheepDeathServiceImpl.java # zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScWeanRecordServiceImpl.java # zhyc-module/src/main/resources/mapper/produce/breed/ScDryMilkMapper.xml # zhyc-module/src/main/resources/mapper/produce/breed/ScSheepDeathMapper.xml