From 72673bfa121bbe0bf2afa400334b015a6710da5b Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 3 Nov 2021 17:33:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=85=B3=E8=81=94model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/SysRefUserRoleModel.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java new file mode 100644 index 0000000..a502375 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author ns + * @create 2021/11/3 0003 下午 17:31 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("用户角色关联model") +public class SysRefUserRoleModel implements Serializable { + private SysRefUserRole sysRefUserRole; + private SysUser sysUser; +} From 5b5e00eee7a277e40fd95bcee79b2932b7832139 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 4 Nov 2021 10:50:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?model=20core=20=E5=A2=9E=E5=8A=A0SysRoleMod?= =?UTF-8?q?el?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/{SysRefUserRoleModel.java => SysRoleModel.java} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/{SysRefUserRoleModel.java => SysRoleModel.java} (68%) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java similarity index 68% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java index a502375..1a033dd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.model.platform; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole; +import cn.estsh.i3plus.pojo.platform.bean.SysRole; import cn.estsh.i3plus.pojo.platform.bean.SysUser; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; @@ -17,7 +19,7 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Api("用户角色关联model") -public class SysRefUserRoleModel implements Serializable { - private SysRefUserRole sysRefUserRole; - private SysUser sysUser; +public class SysRoleModel implements Serializable { + private SysRole sysRole; + private Pager pager; }