平台导出优化扩展字段

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 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;
@@ -36,6 +37,10 @@ public class SysLogUserLogin extends BaseBean {
     @AnnoOutputColumn(hidden = true)
     private Long userId;
 
+    @Column(name = "USER_NAME_RDD")
+    @ApiParam(value = "用户名称", access = "账号名称")
+    private String logUserName;
+
     @Column(name="LOG_LOGIN_NAME")
     @ApiModelProperty(value ="登录名称" , access ="登录名称")
     private String logLoginName;

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

@@ -11,10 +11,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
 
 /**
  * @Description :
@@ -67,4 +64,8 @@ public class SysPojoVersionDetail extends BaseBean {
     @Column(name="POJO_COMPARE_TXT",length = 5000)
     @ApiParam(value ="记录对象对比差异")
     private String pojoCompareTxt;
+
+    @Transient
+    @ApiParam(value = "角色Id关联查询")
+    private Long roleId;
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -86,6 +88,7 @@ public class SysUser extends BaseBean {
 
     @Column(name = "USER_STATUS")
     @ApiParam(value = "账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)", example = "-1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class,refForeignKey = "value", value = "description")
     private Integer userStatus;
 
     @Column(name = "USER_LOGIN_NUM")