Skip to content

Y
yichengstreet-be
Commit 6583cd34 authored by luben's avatar luben
Browse files
Options

Merge branch 'dev-lb' into 'dev' 

Dev lb

See merge request !122
parents 0376204c a53d477f
Pipeline #143208 passed with stages
      in 6 minutes and 32 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 1 addition and 0 deletions
      ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml
      View file @ 6583cd34
      ...@@ -682,6 +682,7 @@ ...@@ -682,6 +682,7 @@
      and level = 4 and wg_type = #{type} and level = 4 and wg_type = #{type}
      and wg_code like CONCAT(#{code}, '%') and wg_code like CONCAT(#{code}, '%')
      and wg_code != #{code} and wg_code != #{code}
      order by wg_code
      </select> </select>
      <select id="getAllLevelTwoByType" resultType="com.ruoyi.system.domain.grid.GridRegion"> <select id="getAllLevelTwoByType" resultType="com.ruoyi.system.domain.grid.GridRegion">
      select select
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment