Merge remote-tracking branch 'origin/master'

zengh

2021-08-12 642414e16907bdd2a47642a9a83c1bc002c6b081

 src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml

@@ -22,6 +22,7 @@
        <result column="type" property="type"/>
        <result column="reason" property="reason"/>
        <result column="ctime" property="ctime"/>
        <result column="deptid" property="deptid"/>
    </resultMap>