Merge branch 'dev' into 'main'

Dev

See merge request !123

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

@@ -682,6 +682,7 @@
     and level = 4 and wg_type = #{type}
     and wg_code like CONCAT(#{code}, '%')
     and wg_code != #{code}
+    order by wg_code
   </select>
     <select id="getAllLevelTwoByType" resultType="com.ruoyi.system.domain.grid.GridRegion">
       select