Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

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

@@ -24,6 +24,14 @@
        <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"/>
        <result column="examinetime" property="examinetime"/>
        <result column="cardid" property="cardid"/>
        <result column="representativecell" property="representativecell"/>
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
        <result column="storage" property="storage"/>
    </resultMap>


@@ -31,4 +39,8 @@
        select * from sys_record
    </select>

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

</mapper>