Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/dao/mapper/RegionMapper.java

@@ -33,8 +33,8 @@ public interface RegionMapper extends BaseMapper<Region> {
     @Select("select code,name from area_code")
     List<Map<String, Object>> selectAreaCodes();
 
-    @Select("select user_id userId,name from user_info where user_id in (${clerks})")
-    List<Map<String, Object>> selectRegionMember(@Param("clerks") String clerk);
+    @Select("select user_id userId,name from user_info where user_id in (${userOrClerks})")
+    List<Map<String, Object>> selectRegionMember(@Param("userOrClerks") String userOrClerks);
 
     @Select("select name,code from area_code where parent=#{cityCode}")
     List<Map<String, Object>> areas(String cityCode);