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

suishenbang-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="roleId !=null and roleId !='' ">
 			and role_id=#{roleId}
 		</if>
-
+		and shop_type is null
 	</delete>
 
 	<delete id="deleteUserRoleInfos">