Merge remote-tracking branch 'origin/master'

孔祥富

2021-02-27 4e94fa3ebf98bb8a9a6eda39a7324461fc4ebb40

 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,