Conflicts:
	csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CooperationController.java
	csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/CooperationDao.java
	csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/CooperationTagDO.java
	csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/CooperationService.java
	csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CooperationServiceImpl.java
	csm-service/cms-service-user/src/main/resources/mapper/CooperationDao.xml