diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d2270cb..7bd9a7a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1446,7 +1446,8 @@ public class WmsEnumUtil { public enum ACTION_MOUDULE_PARAM_TYPE { CHECKLIST(1, "可选列表"), NUMBER(10, "数字"), - STRING(20, "字符串"); + STRING(20, "字符串"), + OUT_OR_UNNECESSARY(30, "出参或者不必需的参数"); private int value; private String description; 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 47dd135..59baf96 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 @@ -40,18 +40,6 @@ public class SessionUser implements Serializable { @ApiParam("用户对象信息") private SysUserInfo userInfo; - @ApiParam("主要组织信息") - private SysOrganize organize; - - @ApiParam("主要组织集合") - private List organizeList; - - @ApiParam("主要部门信息") - private SysDepartment department; - - @ApiParam("主要部门集合") - private List departmentList; - public SessionUser() { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 19050c4..80dedea 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -119,6 +119,14 @@ public class SysUser extends BaseBean { /********************************** 非数据库信息 ********************************/ @Transient + @ApiParam(value ="用户部门信息") + private SysDepartment department; + + @Transient + @ApiParam(value ="用户组织信息") + private SysOrganize organize; + + @Transient @ApiParam(value ="账号所有操作组织信息") private List organizeList; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 17cf947..68ba901 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -201,7 +201,7 @@ public class SysUserInfo extends BaseBean { private List organizeList; @Transient - @ApiParam(value ="用户岗位信息") + @ApiParam(value ="用户部门信息") private SysDepartment department; @Transient