Merge branch 'dev0.2' into dev

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java

@@ -70,14 +70,15 @@ public class ResiGroupMemberRedis {
      * @Date 2020.04.13 23:36
      **/
     public ResiGroupMemberInfoRedisDTO get(String groupId ,String userId){
-
+        /*
-        Map<String, Object> map = redisUtils.hGetAll(RedisKeys.getResiGroupMemberInfoKey(groupId,userId));
+        Map<String, Object> map = redisUtils.hGetAll();
         if (MapUtil.isEmpty(map)) {
             return null;
         }
         //map to bean
-        ResiGroupMemberInfoRedisDTO member = BeanUtil.mapToBean(map, ResiGroupMemberInfoRedisDTO.class, true);
+        ResiGroupMemberInfoRedisDTO member = BeanUtil.mapToBean(map, ResiGroupMemberInfoRedisDTO.class, true);*/
-        return member;
+        return (ResiGroupMemberInfoRedisDTO) redisUtils.get(RedisKeys.getResiGroupMemberInfoKey(groupId,userId));
+
     }
 
     /**

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java

@@ -109,7 +109,7 @@ public interface PartyMemberConstant {
 	/**
 	 * 网格ID
 	 */
-	String ALL = " all";
+	String ALL = "all";
 
 	/**
 	 * 认证成功
@@ -120,4 +120,9 @@ public interface PartyMemberConstant {
 	 * 认证失败
 	 */
 	String CONFIRM_FAILED = "1";
+
+	/**
+	 * 居民端
+	 */
+	String RESI = "resi";
 }