1.用户信息添加 语言

2.考勤模板-日本 去掉部门

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -171,8 +171,10 @@ public class SysUser extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate joinedDate;
 
-    // 入职时间
+    // 生日
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate birthday;
+    // 语言
+    private String language;
 
 }

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -20,6 +20,7 @@
         <result property="loginIp" column="login_ip"/>
         <result property="loginDate" column="login_date"/>
         <result property="birthday" column="birthday"/>
+        <result property="language" column="language"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -81,7 +82,8 @@
                r.data_scope,
                r.status as role_status,
                u.joined_date,
-               u.birthday
+               u.birthday,
+               u.language
         from sys_user u
             left join sys_dept d on u.dept_id = d.dept_id
             left join sys_user_role sur on u.user_id = sur.user_id
@@ -90,7 +92,7 @@
 
     <select id="selectPageUserList" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,u.language,u.birthday,u.language
         from sys_user u
             left join sys_dept d on u.dept_id = d.dept_id
         ${ew.getCustomSqlSegment}

zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/DkRecordServiceImpl.java

@@ -554,7 +554,7 @@ public class DkRecordServiceImpl implements DkRecordService {
     private void fillTemplateRiBen(Sheet sheet, EmployeeAttendance data,String date,DkAttendanceGroupAndUser user) {
         // 1.填充标题区域
         setCellValue(sheet, 3, 1, date);
-        setCellValue(sheet, 3, 8, user.getDeptName());
+       // setCellValue(sheet, 3, 8, user.getDeptName());
         setCellValue(sheet, 6, 6, user.getUserName());
         setCellValue(sheet, 6, 8, user.getNickName());