Merge remote-tracking branch 'origin/developer' into developerD

src/main/resources/mappings/modules/serviceteam/CmServiceteamRoleMapper.xml

@@ -56,7 +56,7 @@
 	</select>
     <select id="findTeams" resultType="com.caimei.modules.serviceteam.entity.CmServiceteamRole">
 		SELECT DISTINCT
-		csr.leaderId,IF(csm.serviceproviderId IS NULL,2,1) as manager,csr.createdTime,s.name as leaderName,csr.id as teamId
+		csr.leaderId,IF(csm.serviceproviderId IS NULL,2,1) as manager,csr.createdTime,s.linkMan as leaderName,csr.id as teamId
 		FROM cm_serviceteam_role csr
 		LEFT JOIN serviceprovider s ON csr.leaderId = s.serviceProviderID
 		LEFT JOIN cm_serviceteam_manager csm ON csr.leaderId = csm.serviceproviderId
@@ -69,7 +69,7 @@
 		order by csr.createdTime desc
 	</select>
 	<select id="findGroups" resultType="com.caimei.modules.project.model.ServiceProviderModel">
-		SELECT csg.serviceId AS serviceProviderID,s.name
+		SELECT csg.serviceId AS serviceProviderID,s.linkMan as name
 		FROM cm_serviceTeam_group csg
 		LEFT JOIN serviceprovider s ON csg.serviceId=s.serviceProviderID
 		WHERE csg.teamId = #{id}