Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml

@@ -124,6 +124,8 @@
        ) B ON A.dept_id = B.dept_id
        WHERE A.dept_id = #{deptid}
    </select>


    <!--保安员持证和未持证数量-->
    <select id="selectHold" resultType="java.util.HashMap">
        SELECT IFNULL(A.thisnum, 0) AS cz,