Merge remote-tracking branch 'origin/master'

tangzy

2021-11-25 a9ec32e3db22fa4f5f44fa2b68e92862c1f58a5d

 src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml

@@ -24,6 +24,17 @@
        <result column="offices" property="offices"/>
        <result column="officetime" property="officetime"/>
        <result column="deptid" property="deptid"/>
        <result column="representativecell" property="representativecell"/>
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
        <result column="approve" property="approve"/>
        <result column="papprove" property="papprove"/>
        <result column="xapprove" property="xapprove"/>
        <result column="sapprove" property="sapprove"/>
        <result column="popinion" property="popinion"/>
        <result column="xopinion" property="xopinion"/>
        <result column="sopinion" property="sopinion"/>
        <result column="overtime" property="overtime"/>
    </resultMap>