Merge branch 'dev' into 'main'

Dev

See merge request !182

ruoyi-system/src/main/java/com/ruoyi/system/mapper/grid/GridRegionMapper.java

@@ -73,4 +73,6 @@ public interface GridRegionMapper {
     String getRegionJzArea(@Param("id")String id);
 
     int updateRegionJzArea(@Param("id")String id,@Param("JzArea")String JzArea);
+
+    String getJzAreaByCode(@Param("code")String code);
 }
\ No newline at end of file

ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml

@@ -716,8 +716,12 @@
     select jz_area from grid_region
     where id = #{id}
   </select>
+    <select id="getJzAreaByCode" resultType="java.lang.String">
+      select jz_area from grid_region
+      where wg_code = #{code}
+    </select>
 
-  <update id="changeTreeNodeName">
+    <update id="changeTreeNodeName">
     update grid_region set wg_name=#{name} where id = #{id}
   </update>
     <update id="changeTreeNodeNameByCode">