From 68d0142f677ba36cd33a2663aedf3b91bbe1504c Mon Sep 17 00:00:00 2001
From: "wei.peng" <pengwei940613@163.com>
Date: Wed, 24 Oct 2018 09:27:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E3=80=81=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=20=20=20=E5=AE=9E=E4=BD=93=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/platform/bean/SysMenu.java   | 12 ++++--
 .../estsh/i3plus/pojo/platform/bean/SysRole.java   | 47 ++++++++++++++++++++--
 2 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
index 5f7b0bb..106c88d 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
@@ -41,8 +41,8 @@ public class SysMenu extends BaseBean {
     private String redMenuTypeName;
  
     @Column(name="PARENT_ID")
-    @ApiParam(value ="父级功能ID" , access ="父级功能ID")
-    private String parentId;
+    @ApiParam(value ="父级功能ID" , access ="父级功能ID" ,example = "0")
+    private long parentId;
  
     @Column(name="RED_PARENT_NAME")
     @ApiParam(value ="父级功能名称" , access ="父级功能名称")
@@ -63,9 +63,13 @@ public class SysMenu extends BaseBean {
     @Column(name="MENU_ICON")
     @ApiParam(value ="资源icon" , access ="资源icon")
     private String menuIcon;
+
+    @Column(name="MENU_DESCRIPTION")
+    @ApiParam(value ="资源描述" , access ="配置描述")
+    private String menuDescription;
  
     @Column(name="MENU_STATUS")
-    @ApiParam(value ="功能状态（1.正常，2.禁用）" , example ="1" , access ="功能状态（1.正常，2.禁用）")
-    private Integer menuStatus;
+    @ApiParam(value ="功能状态（1.正常，2.禁用）" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1")
+    private Integer menuStatus = 1;
 
 }
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 7cff976..8edf862 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
@@ -17,12 +17,51 @@ import javax.persistence.Table;
  * @Modify:
  **/
 @Entity
-@Table(name="sys_role")
+@Table(name="SYS_ROLE")
 @Data
 @Api(value="用户角色表",description = "用户权限角色。")
 public class SysRole extends BaseBean {
 
-    @Column(name="role_name")
-    @ApiParam(value = "角色名称")
-    private String roleName;
+    @Column(name="NAME")
+    @ApiParam(value ="角色名称" , access ="角色名称")
+    private String name;
+
+    @Column(name="ROLE_DESCRIPTION")
+    @ApiParam(value ="资源描述" , access ="配置描述")
+    private String roleDescription;
+
+    @Column(name="ROLE_GRADE")
+    @ApiParam(value ="角色等级（待定）" , example ="1" , access ="角色等级（待定）")
+    private Integer roleGrade;
+
+    @Column(name="ROLE_PARENT_ID")
+    @ApiParam(value ="角色父节点ID" , access ="角色父节点ID")
+    private String roleParentId;
+
+    @Column(name="RED_ROLE_PARENT_ID")
+    @ApiParam(value ="角色父节点名称" , access ="角色父节点名称")
+    private String redRoleParentId;
+
+    @Column(name="RED_MODULE_NAMES")
+    @ApiParam(value ="权限模块名称" , access ="权限模块名称")
+    private String redModuleNames;
+
+    @Column(name="RED_MODULE_NUMBER")
+    @ApiParam(value ="权限模块数量" , example ="0" , access ="权限模块数量")
+    private Integer redModuleNumber;
+
+    @Column(name="RED_MENU_NAMES")
+    @ApiParam(value ="权限功能名称" , access ="权限功能名称")
+    private String redMenuNames;
+
+    @Column(name="RED_MENU_NUMBER")
+    @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量")
+    private Integer redMenuNumber;
+
+    @Column(name="ROLE_STATUS")
+    @ApiParam(value ="角色状态（1.正常，2.状态）" , example ="1" , access ="角色状态（1.正常，2.状态）")
+    private Integer roleStatus = 1;
+
+
+
 }