平台-导出冗余字段

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -584,9 +584,9 @@ public class CommonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOCK_TYPE {
 
-        NOT_LOGGED_A_LONG_TIME(1, "not logger a long time", "长时间未登录锁定"),
+        NOT_LOGIN_A_LONG_TIME(1, "not login a long time", "禁用-长时间未登录"),
-        LOGGER_TOO_MANY_FAILURES(2, "logger too many failures", "登录失败次数过多锁定"),
+        LOGGER_TOO_MANY_FAILURES(2, "logger too many failures", "锁定-登录失败次数过多"),
-        ADMIN_HAND_MOVEMENT_LOCKING(3, "admin hand movement locking", "管理员手动锁定");
+        ADMIN_HAND_MOVEMENT_LOCKING(3, "admin hand movement locking", "锁定-管理员手动锁定");
 
         private int value;
         private String code;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java

@@ -22,4 +22,9 @@ public class ExportDataModel {
 
     private Integer module;
 
+    //**************************************冗余字段*****************************************
+    private String startDate;
+
+    private String endDate;
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
@@ -42,6 +43,16 @@ public class SysLogRoleChange extends BaseBean {
     @ApiModelProperty(value = "用户名", access = "用户名")
     private String userName;
 
+    /********************************** 导出冗余信息 ********************************/
+    @Column(name = "USER_LOGIN_NAME")
+    @ApiModelProperty(value = "登录名", access = "登录名")
+    private String userLoginName;
+
+    @Column(name = "DEPARTMENT_NAME_RDD")
+    @ApiParam(value = "部门名称", access = "部门名称")
+    private String departmentNameRdd;
+    /********************************** 完 ********************************/
+
     @Column(name = "PREVIOUS_ROLES",columnDefinition = "TEXT")
     @ApiModelProperty(value = "之前的角色", access = "之前的角色")
     private String previousRoles;