Merge remote-tracking branch 'origin/master'

zengh

2021-08-13 05d218bdda3f09aa5d057fda916f5f0b668fb720

 src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml

@@ -24,6 +24,8 @@
        <result column="offices" property="offices"/>
        <result column="officetime" property="officetime"/>
        <result column="deptid" property="deptid"/>
        <result column="permitime" property="permitime"/>
        <result column="ptype" property="ptype"/>
    </resultMap>