# Conflicts:
#	src/main/java/com/patzn/cloud/service/lims/hmhj/controller/OriginalTemplateController.java
#	src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemMapper.java
#	src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemService.java
#	src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalTemplateService.java
#	src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java
#	src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java
#	src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/OriginalTemplateServiceImpl.java
#	src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml