Merge branch 'dev-lb' into 'dev'

Dev lb

See merge request !234

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

@@ -578,7 +578,7 @@
     select wg_code from grid_region where level=1 and wg_type = '1'
   </select>
   <select id="getWgNameByCode" resultType="java.lang.String">
-    select wg_name  from grid_region where wg_code = #{wgCode,jdbcType=VARCHAR}
+    select wg_name  from grid_region where wg_code = #{wgCode,jdbcType=VARCHAR} and wg_type = '1'
   </select>
 
     <select id="getByParams" resultType="com.ruoyi.system.domain.grid.GridRegion" parameterType="com.ruoyi.system.domain.grid.enums.GridRegionSearchParam">