Merge remote-tracking branch 'origin/master'

value

2023-08-30 19c9e29273e8e751847d9dcb06b346dede48d2c8

 user-server/src/main/resources/mapper/UserMapper.xml

@@ -21,7 +21,7 @@

    <select id="getNewPersonnelPage" resultType="map">
        SELECT u.`id`, u.`name` username, r.`name` roleName, DATE_FORMAT(u.`create_time`, '%Y-%m-%d') createTime,
        u.`age`,
        u.`age`, CONCAT(r.`id`, '') roleId,
        u.`phone`, u.`email`, u.`job_state` jobState, o.`department`, u.`account`, o.`id` departmentId
        FROM `user` u
        LEFT JOIN role r