Merge branch 'test' into 'master'

罗元桥

2021-08-31 a25c8f0ccfe35369e0c60d02bf9a3309ad650dfa

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml

@@ -55,6 +55,8 @@
            u.`sex`,
            u.nick_name,
            u.phone,
            u.is_volunteer,
            u.is_partymember,
            u.birthday,
            YEAR (
                now()) - YEAR (