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

src/main/resources/mappings/modules/user/CmSpMapper.xml

@@ -240,8 +240,8 @@
 	</update>
 
 	<insert id="choseManager">
-		insert into cm_serviceteam_manager (serviceProviderId,delflag,validFlag)
-		values (#{serviceProviderID},0,1)
+		insert into cm_serviceteam_manager (serviceProviderId,delflag)
+		values (#{serviceProviderID},0)
 	</insert>
 
 	<select id="findByUserId" resultType="com.caimei.modules.user.entity.NewCmSp">