Browse Source

变更记录返回原因变更时间,调整时间为createdTime

dev
yinzuomei 3 years ago
parent
commit
230b3fa476
  1. 11
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java
  2. 3
      epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml

11
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java

@ -17,9 +17,11 @@
package com.epmet.dto; package com.epmet.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
@ -89,8 +91,9 @@ public class IcUserChangeRecordDTO implements Serializable {
private String afterChangeName; private String afterChangeName;
/** /**
* 调整时间 * 变更时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date changeTime; private Date changeTime;
/** /**
@ -119,8 +122,10 @@ public class IcUserChangeRecordDTO implements Serializable {
private String createdBy; private String createdBy;
/** /**
* 创建时间 * 创建时间
* 调整时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date createdTime; private Date createdTime;
/** /**

3
epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml

@ -18,7 +18,8 @@
after_change_name, after_change_name,
change_time, change_time,
remark, remark,
REASON REASON,
CREATED_TIME
FROM FROM
ic_user_change_record ic_user_change_record
WHERE WHERE

Loading…
Cancel
Save