Merge remote-tracking branch 'origin/master'

luoyb

2021-02-17 e3ee3dac0ef868d7c58295c89003cc35deab16d1

 febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml

@@ -5,6 +5,8 @@
        SELECT
        u.user_id userId,
        u.username,
        u.certificateNumb,
        u.nickName,
        u.email,
        u.mobile,
        u.status,