Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml

@@ -154,6 +154,10 @@
        select id ,dept_name deptName from blade_dept where is_deleted=0
    </select>

    <select id="selXQList" resultType="org.springblade.common.vo.DeptVo">
        select id ,dept_name deptName from sys_jurisdiction where is_deleted=0
    </select>


    <select id="selectInfo" resultType="java.util.HashMap">
        SELECT