From 2ffc28b6cb5ed965641a5ac81e5618bc11befe31 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiwnagwbs@163.com>
Date: Sun, 22 Apr 2018 13:52:24 +0800
Subject: [PATCH] merge

---
 .../domain/entity/sys/DataDictionary.java     | 21 ++++----------
 .../domain/entity/sys/SysAuthority.java       | 29 +++++--------------
 .../com/xwbing/domain/entity/sys/SysRole.java | 17 ++++-------
 3 files changed, 19 insertions(+), 48 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/DataDictionary.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/DataDictionary.java
index 0ca7a79..6395cce 100644
--- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/DataDictionary.java
+++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/DataDictionary.java
@@ -1,5 +1,6 @@
 package com.xwbing.domain.entity.sys;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -18,25 +19,15 @@ import javax.persistence.Entity;
 public class DataDictionary extends BaseEntity {
     private static final long serialVersionUID = -3409347240188002427L;
     public static String table = "data_dict";
-    /**
-     * 英文名称  编码 唯一
-     */
+    @ApiModelProperty(value = "编码", required = true)
     private String code;
-    /**
-     * 名称
-     */
+    @ApiModelProperty(value = "名称", required = true)
     private String name;
-    /**
-     * 描述
-     */
+    @ApiModelProperty(value = "描述")
     private String description;
-    /**
-     * 父键
-     */
+    @ApiModelProperty(value = "父键")
     @Column(name = "parent_id")
     private String parentId;
-    /**
-     * 是否启用
-     */
+    @ApiModelProperty(value = "是否启用(Y|N)", example = "Y", required = true)
     private String enable;
 }
diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysAuthority.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysAuthority.java
index c6f783e..9def954 100644
--- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysAuthority.java
+++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysAuthority.java
@@ -1,5 +1,6 @@
 package com.xwbing.domain.entity.sys;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -18,33 +19,19 @@ import javax.persistence.Entity;
 public class SysAuthority extends BaseEntity {
     private static final long serialVersionUID = -6469518352117371987L;
     public static String table = "sys_authority";
-    /**
-     * 名称
-     */
+    @ApiModelProperty(value = "名称", required = true)
     private String name;
-    /**
-     * 编号
-     */
+    @ApiModelProperty(value = "编码", required = true)
     private String code;
-    /**
-     * 是否启用
-     */
+    @ApiModelProperty(value = "是否启用(Y|N)", example = "Y", required = true)
     private String enable;
-    /**
-     * url地址
-     */
+    @ApiModelProperty(value = "url地址", required = true)
     private String url;
-    /**
-     * 父ID
-     */
+    @ApiModelProperty(value = "父ID")
     @Column(name = "parent_id")
     private String parentId;
-    /**
-     * 类型 1菜单 2按钮
-     */
+    @ApiModelProperty(value = "类型(菜单:1|按钮:2)", example = "1", required = true)
     private Integer type;
-    /**
-     * 排序
-     */
+    @ApiModelProperty(value = "排序", required = true)
     private Integer sort;
 }
diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRole.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRole.java
index 1902a3a..4c7dc77 100644
--- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRole.java
+++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRole.java
@@ -1,5 +1,6 @@
 package com.xwbing.domain.entity.sys;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,20 +18,12 @@ import javax.persistence.Entity;
 public class SysRole extends BaseEntity {
     private static final long serialVersionUID = -3048021197170624143L;
     public static String table = "sys_role";
-    /**
-     * 角色名称
-     */
+    @ApiModelProperty(value = "名称", required = true)
     private String name;
-    /**
-     * 角色编码
-     */
+    @ApiModelProperty(value = "编码", required = true)
     private String code;
-    /**
-     * 是否启用
-     */
+    @ApiModelProperty(value = "是否启用(Y|N)", example = "Y", required = true)
     private String enable;
-    /**
-     * 描述
-     */
+    @ApiModelProperty(value = "描述", required = true)
     private String remark;
 }