Skip to content

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

Merge branch 'dev' into 'main' 

Dev

See merge request !50
parents c5e58077 71ea5c05
Pipeline #142972 passed with stages
        in 2 minutes and 41 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 1 addition and 1 deletion
        ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml
        View file @ ea74acf9
        ......@@ -587,7 +587,7 @@
        )
        </if>
        <if test="isShow == false">
        and level != '4'
        and level != '4' and level != '3'
        </if>
        <if test="wgCodeIn != null and wgCodeIn.size() > 0">
        and wg_code in
        ......
        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