From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage

---
 src/main/java/com/highdatas/mdm/entity/MasterAuthor.java |  128 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 111 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/highdatas/mdm/entity/MasterAuthor.java b/src/main/java/com/highdatas/mdm/entity/MasterAuthor.java
index b450cac..1b23aa0 100644
--- a/src/main/java/com/highdatas/mdm/entity/MasterAuthor.java
+++ b/src/main/java/com/highdatas/mdm/entity/MasterAuthor.java
@@ -22,49 +22,134 @@
 public class MasterAuthor extends Model<MasterAuthor> {
 
     private static final long serialVersionUID = 1L;
-
+    /*
+     *涓婚敭
+     * */
     private String id;
-
+    /*
+     *鏉冮檺绫诲瀷
+     * */
     private MasterAuthorType type;
-
+    /*
+     *琛ㄥ悕
+     * */
     @TableField("table_name")
     private String tableName;
-
+    /*
+     *鏄惁鑷姩娣诲姞瀛楁
+     * */
     @TableField("field_auto")
     private Boolean fieldAuto;
+    /*
+     *鏄惁鏄敤鎴风粍
+     * */
+    @TableField("user_group")
+    private Boolean userGroup;
 
-    @TableField("is_group")
-    private Boolean isGroup;
+    /*
+     * 鐢熸垚鐗堟湰鏄槸鍚﹁嚜鍔ㄦ坊鍔�
+     * */
 
     @TableField("maintain_auto")
     private Boolean maintainAuto;
-
+    /*
+     *鍒涘缓浜篿d
+     * */
     @TableField("character_id")
     private String characterId;
-
+    /*
+     *涓婚id
+     * */
     @TableField("menu_id")
     private String menuId;
-
+    /*
+     *瀛楁鐗堟湰id
+     * */
     @TableField(value = "maintain_field_id", strategy = FieldStrategy.IGNORED)
     private String maintainFieldId;
 
-
+    /*
+     *鏄惁婵�娲�
+     * */
     private Boolean active;
-
+    /*
+     *鏄惁娉ㄥ唽
+     * */
+    private Boolean subscribe;
+    /*
+     *鏄惁澧為噺
+     * */
+    private Boolean increment;
+    /*
+     *鍒涘缓鏃堕棿
+     * */
     @TableField("create_time")
     private Date createTime;
-
+    /*
+     *鏇存柊鏃堕棿
+     * */
     @TableField("update_time")
     private Date updateTime;
-
+    /*
+     * 瀛楁鍒楄〃
+     * */
     private transient List<MasterAuthorDetail> fields;
+    /*
+     *涓婚鍚嶇О
+     * */
+    private transient String menuName;
+    /*
+     *鏄惁鏄剧ず
+     * */
+    private transient Boolean isShow;
+    /*
+     *鐖剁骇涓婚鍒楄〃
+     * */
+    private transient List<SysMenu> parentMenuList;
 
-    public Boolean getGroup() {
-        return isGroup;
+
+    public Boolean getIncrement() {
+        return increment;
     }
 
-    public MasterAuthor setGroup(Boolean group) {
-        isGroup = group;
+    public MasterAuthor setIncrement(Boolean increment) {
+        this.increment = increment;
+        return this;
+    }
+
+    public Boolean getShow() {
+        return isShow;
+    }
+
+    public MasterAuthor setShow(Boolean show) {
+        isShow = show;
+        return this;
+    }
+
+    public String getMenuName() {
+        return menuName;
+    }
+
+    public MasterAuthor setMenuName(String menuName) {
+        this.menuName = menuName;
+        return this;
+    }
+
+    public Boolean getSubscribe() {
+        return subscribe;
+    }
+
+    public MasterAuthor setSubscribe(Boolean subscribe) {
+        this.subscribe = subscribe;
+        return this;
+    }
+
+    public Boolean getUserGroup() {
+        return userGroup;
+    }
+
+    public MasterAuthor setUserGroup(Boolean userGroup) {
+        this.userGroup = userGroup;
         return this;
     }
 
@@ -187,4 +272,13 @@
         ", updateTime=" + updateTime +
         "}";
     }
+
+    public MasterAuthor setParentMenuList(List<SysMenu> parentMenuList) {
+        this.parentMenuList = parentMenuList;
+        return this;
+    }
+
+    public List<SysMenu> getParentMenuList() {
+        return parentMenuList;
+    }
 }

--
Gitblit v1.8.0