Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

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

@@ -30,6 +30,7 @@
        <result column="representativecell" property="representativecell"/>
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
        <result column="storage" property="storage"/>
    </resultMap>


@@ -37,4 +38,7 @@
        select * from sys_recordk
    </select>

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