Merge remote-tracking branch 'origin/dev_abandon_grid' into develop

epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml

@@ -79,7 +79,7 @@
 
     <!-- 根据userId查询注册网格ID -->
     <select id="selectRegisterGridIdByUserId" resultType="java.lang.String">
-        SELECT GRID_ID FROM register_relation WHERE DEL_FLAG = 0 and USER_ID = #{userId}
+        SELECT GRID_ID FROM register_relation WHERE DEL_FLAG = 0 AND FIRST_REGISTER = 1 and USER_ID = #{userId}
     </select>
 
     <!-- 居民注册关系 -->