Browse Source

修改日期类型

main
1341924763@qq.com 1 day ago
parent
commit
4977383bbb

+ 2
- 1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java View File

import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.time.LocalDate;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;




// 入职时间 // 入职时间
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date joinedDate;
private LocalDate joinedDate;


} }

+ 1
- 0
zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/DkRecordServiceImpl.java View File

// 准备数据 // 准备数据
dkCheckInRecordDTO.setSysUserId(dk.getSysUserId()); dkCheckInRecordDTO.setSysUserId(dk.getSysUserId());
dkCheckInRecordDTO.setSysUserName(dk.getSysUserName()); dkCheckInRecordDTO.setSysUserName(dk.getSysUserName());
dkCheckInRecordDTO.setNickName(dk.getNickName());
// 国内模版 // 国内模版
if(Constans.GUONEI.equals(dkCheckInRecordDTO.getModelType())){ if(Constans.GUONEI.equals(dkCheckInRecordDTO.getModelType())){
// 构造导出数据 // 构造导出数据

Loading…
Cancel
Save