Conflicts:
	acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleListController.java
	acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSampleListMapper.java
	acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSampleListMapper.xml
	acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSampleListService.java
	acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleListServiceImpl.java