修改日期类型

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

@@ -16,6 +16,7 @@ import lombok.NoArgsConstructor;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -168,6 +169,6 @@ public class SysUser extends BaseEntity {
 
     // 入职时间
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date joinedDate;
+    private LocalDate joinedDate;
 
 }

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

@@ -192,6 +192,7 @@ public class DkRecordServiceImpl implements DkRecordService {
                     // 准备数据
                     dkCheckInRecordDTO.setSysUserId(dk.getSysUserId());
                     dkCheckInRecordDTO.setSysUserName(dk.getSysUserName());
+                    dkCheckInRecordDTO.setNickName(dk.getNickName());
                     // 国内模版
                     if(Constans.GUONEI.equals(dkCheckInRecordDTO.getModelType())){
                         // 构造导出数据