Merge branch 'dev-lb' into 'dev'

Dev lb

See merge request !85

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

@@ -685,7 +685,7 @@
   </select>
 
   <update id="changeTreeNodeName">
-    update grid_region set name=#{name} where id = #{id}
+    update grid_region set wg_name=#{name} where id = #{id}
   </update>
 
 </mapper>
\ No newline at end of file