Conflicts:
	precision-effect-admin/src/main/java/com/zehong/web/controller/transaction/TTradeProjectController.java
	precision-effect-system/src/main/java/com/zehong/system/mapper/TTradeProjectMapper.java
	precision-effect-system/src/main/java/com/zehong/system/service/ITTradeProjectService.java
	precision-effect-system/src/main/java/com/zehong/system/service/impl/TTradeProjectServiceImpl.java
	precision-effect-system/src/main/resources/mapper/business/TTradeProjectMapper.xml