Merge remote-tracking branch 'origin/master'

zengh

2021-08-15 0cab6d8afcc97e8bc94ef200e24d8839281f44c8

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -43,6 +43,8 @@
        <result column="examinationMx" property="examinationMx"/>
        <result column="fingerprint" property="fingerprint"/>
        <result column="photo" property="photo"/>
        <result column="dispatch" property="dispatch"/>
        <result column="my_picture" property="myPicture"/>
    </resultMap>

    <select id="selectUserPage" resultMap="userResultMap">
@@ -174,4 +176,9 @@
        update blade_user set hold=#{hold} where cardid=#{cardid}
    </update>

    <!--查询所有未注销用户-->
    <select id="getAllUserList" resultType="org.springblade.modules.system.entity.User">
        select id,cardid from blade_user where is_deleted = 0
    </select>

</mapper>