Merge remote-tracking branch 'origin/master'

zengh

2021-08-12 642414e16907bdd2a47642a9a83c1bc002c6b081

 src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml

@@ -36,7 +36,7 @@
    </select>

    <select id="selectIn" resultType="java.util.HashMap">
        select * from sys_permit where storage=0 and cardid=#{cardid}
        select * from sys_permit where storage=0 and deptid=#{cardid}
    </select>

</mapper>