diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1351011..a397cee 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -14,17 +14,15 @@ jar - - i3plus.pojo - i3plus-pojo-model - - - org.apache.shiro shiro-core + + com.fasterxml.jackson.core + jackson-databind + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java index bc8a084..b686a24 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.platform.bean.*; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; import java.util.Set; @@ -33,16 +34,7 @@ public class UserModel { private SysUserInfo userInfo; @ApiParam(value = "角色信息",access = "用户所拥有岗位信息集合") - private Set roles; - - @ApiParam(value = "岗位信息",access = "用户所拥有岗位信息集合") - private Set positions; - - @ApiParam(value = "部门信息",access = "用户所有用部门信息集合") - private Set departments; - - @ApiParam(value = "组织信息",access = "用户所拥有的组织信息集合") - private Set organizes; + private List roles; @ApiParam(value = "角色信息",access = "用户所拥有岗位信息") private SysRole role; @@ -50,7 +42,7 @@ public class UserModel { @ApiParam(value = "岗位信息",access = "用户所拥有岗位信息") private Position position; - @ApiParam(value = "部门信息",access = "用户所有用部门信息") + @ApiParam(value = "部门信息",access = "用户所拥有部门信息") private Department department; @ApiParam(value = "组织信息",access = "用户所拥有的组织信息") diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ccd1a0c..de63812 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -16,10 +16,6 @@ i3plus.pojo - i3plus-pojo-model - - - i3plus.pojo i3plus-pojo-base diff --git a/pom.xml b/pom.xml index 2bf10d9..6cc1e7e 100644 --- a/pom.xml +++ b/pom.xml @@ -137,4 +137,26 @@ + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + UTF-8 + + + + + + \ No newline at end of file