Merge branch 'dev_move_out_of'

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

@@ -45,7 +45,7 @@
         WHERE
             r.DEL_FLAG = '0'
         <if test="gridId != null and gridId != ''">
-            AND r.GRID_ID = #{gridId}
+            AND r.AGENCY_ID = #{gridId}
         </if>
         <if test="villageId != null and villageId != ''">
             AND r.VILLAGE_ID = #{villageId}