diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java index 7689cbf..a616fbf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java @@ -67,8 +67,8 @@ public class Organize extends BaseBean { @ApiParam(value ="排序" , example ="1") private Integer organizeSort; - @Column(name="ORGANIZE_STATUS") + @Column(name="ORGANIZE_STATUS_ID") @ApiParam(value ="组织状态(枚举:1.正常,2.禁用)" , example ="1") - private Integer organizeStatus; + private Integer organizeStatusId; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index f527e84..5b8fb4a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -29,7 +29,7 @@ public class SessionUser implements Serializable { @ApiParam("用户类型") //CommonEnumUtil.USER_TYPE.xxx.getCode() - private Integer userTypeId; + private String userTypeId; @ApiParam("用户信息") private SysUser user; @@ -61,7 +61,7 @@ public class SessionUser implements Serializable { } - public SessionUser(String userCode, String userName, String siteCode, String languageCode, Integer userTypeId) { + public SessionUser(String userCode, String userName, String siteCode, String languageCode, String userTypeId) { this.userCode = userCode; this.userName = userName; this.languageCode = languageCode; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 935e27b..46e7909 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -69,7 +69,7 @@ public class SysRole extends BaseBean { @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量") private Integer redMenuNumber; - @Column(name="ROLE_STATUS") + @Column(name="ROLE_STATUS_ID") @ApiParam(value ="角色状态(枚举:1.正常,2.状态)" , example ="-1") private Integer roleStatusId; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java index 8a61529..8515436 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java @@ -61,27 +61,27 @@ public class TaskTimeRecording extends BaseBean { } @Column(name="RED_TIME_EXPRESSION") - @ApiParam(value ="时间表达式" , access ="时间表达式") + @ApiParam(value ="时间表达式") private String redTimeExpression; @Column(name="TASK_START_DATE_TIME") - @ApiParam(value ="任务开始时间" , access ="任务开始时间") + @ApiParam(value ="任务开始时间") private String taskStartDateTime; @Column(name="TASK_END_DATE_TIME") - @ApiParam(value ="任务结束时间" , access ="任务结束时间") + @ApiParam(value ="任务结束时间") private String taskEndDateTime; - @Column(name="TASK_STATUS") - @ApiParam(value ="任务完成情况" , access ="任务完成情况") - private String taskStatus; + @Column(name="TASK_STATUS_ID") + @ApiParam(value ="任务完成情况(枚举:1正常,2失败)") + private Integer taskStatusId; @Column(name="TASK_LOG") - @ApiParam(value ="任务日志" , access ="任务日志") + @ApiParam(value ="任务日志") private String taskLog; @Column(name="TASK_LOG_ERROR") - @ApiParam(value ="任务异常日志" , access ="任务异常日志") + @ApiParam(value ="任务异常日志") private String taskLogError; }