From 8a2e7cd77d5bb6803a2102b98a6d5535a7204f4c Mon Sep 17 00:00:00 2001
From: liaoxuwei <5789413@qq.com>
Date: Tue, 2 Aug 2022 15:05:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 portal-manager/doc/api.md                     |   11 +-
 .../xhx/module/menu/model/MenuEntity.java     |  269 ++--
 .../xhx/module/menu/model/MenuQuery.java      | 1213 +++++++++--------
 .../sqlmap/module/menu/MenuMapper.xml         | 1116 +++++++--------
 4 files changed, 1353 insertions(+), 1256 deletions(-)

diff --git a/portal-manager/doc/api.md b/portal-manager/doc/api.md
index 17cd1dd1..2e8fc848 100644
--- a/portal-manager/doc/api.md
+++ b/portal-manager/doc/api.md
@@ -1286,6 +1286,7 @@ data|object|鏁版嵁瀵硅薄
 &emsp;&emsp;createTime|Date|鍒涘缓鏃堕棿
 &emsp;&emsp;createUserId|Long|鍒涘缓鐢ㄦ埛
 &emsp;&emsp;createUserName|String|鍒涘缓鐢ㄦ埛鍚嶇О
+&emsp;&emsp;remark|String|鎻忚堪澶囨敞
 dict|object|瀛楀吀瀵硅薄
 &emsp;linkType|object|瀛楀吀灞炴€у璞★紝璇﹁闄勫綍
 &emsp;visible|object|瀛楀吀灞炴€у璞★紝璇﹁闄勫綍
@@ -1463,6 +1464,7 @@ data|object|鏁版嵁瀵硅薄
 &emsp;createTime|Date|鍒涘缓鏃堕棿
 &emsp;createUserId|Long|鍒涘缓鐢ㄦ埛
 &emsp;createUserName|String|鍒涘缓鐢ㄦ埛鍚嶇О
+&emsp;&emsp;remark|String|鎻忚堪澶囨敞
 dict|object|瀛楀吀瀵硅薄
 &emsp;linkType|object|瀛楀吀灞炴€у璞★紝璇﹁闄勫綍
 &emsp;visible|object|瀛楀吀灞炴€у璞★紝璇﹁闄勫綍
@@ -1490,7 +1492,8 @@ dict|object|瀛楀吀瀵硅薄
             "orderId":6861,
             "createTime":"2022-06-02",
             "createUserId":2189,
-            "createUserName":"zov8bo"
+            "createUserName":"zov8bo",
+            "remark":"zov8bo"
         }
 }
 ```
@@ -1521,7 +1524,7 @@ menuType|Integer|鏄瘄鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
 status|Integer|鏄瘄鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
 authType|Integer|鏄瘄鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
 orderId|Integer|鏄瘄鎺掑簭缂栧彿
-createUserName|String|鏄瘄鍒涘缓鐢ㄦ埛鍚嶇О
+remark|String|鏄瘄鎻忚堪澶囨敞
 
 **璇锋眰鏍蜂緥:**
 ```
@@ -1537,7 +1540,8 @@ createUserName|String|鏄瘄鍒涘缓鐢ㄦ埛鍚嶇О
         "menuType":0,
         "status":1,
         "authType":3,
-        "orderId":0
+        "orderId":0,
+        "remark":"qnglei"
 }
 
 ```
@@ -1566,6 +1570,7 @@ data|object|鏁版嵁瀵硅薄
 &emsp;&emsp;createTime|Date|鍒涘缓鏃堕棿
 &emsp;&emsp;createUserId|Long|鍒涘缓鐢ㄦ埛
 &emsp;&emsp;createUserName|String|鍒涘缓鐢ㄦ埛鍚嶇О
+&emsp;&emsp;remark|String|鎻忚堪澶囨敞
 
 **鍝嶅簲娑堟伅鏍蜂緥:**
 ```
diff --git a/portal-manager/src/main/java/com/mortals/xhx/module/menu/model/MenuEntity.java b/portal-manager/src/main/java/com/mortals/xhx/module/menu/model/MenuEntity.java
index 39a6ddf8..14bfb868 100644
--- a/portal-manager/src/main/java/com/mortals/xhx/module/menu/model/MenuEntity.java
+++ b/portal-manager/src/main/java/com/mortals/xhx/module/menu/model/MenuEntity.java
@@ -7,260 +7,278 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.menu.model.vo.MenuVo;
 /**
-* 鑿滃崟淇℃伅涓氬姟瀹炰綋瀵硅薄
-*
-* @author zxfei
-* @date 2022-06-02
-*/
+ * 鑿滃崟淇℃伅涓氬姟瀹炰綋瀵硅薄
+ *
+ * @author zxfei
+ * @date 2022-08-02
+ */
 
 public class MenuEntity extends MenuVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 鑿滃崟鍚嶇О
-    */
+     * 鑿滃崟鍚嶇О
+     */
     private String name;
     /**
-    * 杩炴帴鍦板潃
-    */
+     * 杩炴帴鍦板潃
+     */
     private String url;
     /**
-    * 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    */
+     * 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     */
     private Long parentId;
     /**
-    * 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    */
+     * 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     */
     private Integer linkType;
     /**
-    * 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
-    */
+     * 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
+     */
     private String imgPath;
     /**
-    * 鎸夐挳鍥炬爣
-    */
+     * 鎸夐挳鍥炬爣
+     */
     private String buttonImgPath;
     /**
-    * 甯哥敤鑿滃崟鍥炬爣
-    */
+     * 甯哥敤鑿滃崟鍥炬爣
+     */
     private String imgCommPath;
     /**
-    * 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    */
+     * 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     */
     private Integer visible;
     /**
-    * 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    */
+     * 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     */
     private Integer menuType;
     /**
-    * 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    */
+     * 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     */
     private Integer status;
     /**
-    * 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    */
+     * 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     */
     private Integer authType;
     /**
-    * 鎺掑簭缂栧彿
-    */
+     * 鎺掑簭缂栧彿
+     */
     private Integer orderId;
     /**
-    * 鍒涘缓鐢ㄦ埛鍚嶇О
-    */
+     * 鍒涘缓鐢ㄦ埛鍚嶇О
+     */
     private String createUserName;
+    /**
+     * 鎻忚堪澶囨敞
+     */
+    private String remark;
 
 
 
     public MenuEntity(){}
     /**
-    * 鑾峰彇 鑿滃崟鍚嶇О
-    * @return String
-    */
+     * 鑾峰彇 鑿滃崟鍚嶇О
+     * @return String
+     */
     public String getName(){
         return name;
     }
     /**
-    * 璁剧疆 鑿滃崟鍚嶇О
-    * @param name
-    */
+     * 璁剧疆 鑿滃崟鍚嶇О
+     * @param name
+     */
     public void setName(String name){
         this.name = name;
     }
     /**
-    * 鑾峰彇 杩炴帴鍦板潃
-    * @return String
-    */
+     * 鑾峰彇 杩炴帴鍦板潃
+     * @return String
+     */
     public String getUrl(){
         return url;
     }
     /**
-    * 璁剧疆 杩炴帴鍦板潃
-    * @param url
-    */
+     * 璁剧疆 杩炴帴鍦板潃
+     * @param url
+     */
     public void setUrl(String url){
         this.url = url;
     }
     /**
-    * 鑾峰彇 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @return Long
-    */
+     * 鑾峰彇 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @return Long
+     */
     public Long getParentId(){
         return parentId;
     }
     /**
-    * 璁剧疆 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @param parentId
-    */
+     * 璁剧疆 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @param parentId
+     */
     public void setParentId(Long parentId){
         this.parentId = parentId;
     }
     /**
-    * 鑾峰彇 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @return Integer
-    */
+     * 鑾峰彇 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @return Integer
+     */
     public Integer getLinkType(){
         return linkType;
     }
     /**
-    * 璁剧疆 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @param linkType
-    */
+     * 璁剧疆 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @param linkType
+     */
     public void setLinkType(Integer linkType){
         this.linkType = linkType;
     }
     /**
-    * 鑾峰彇 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
-    * @return String
-    */
+     * 鑾峰彇 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
+     * @return String
+     */
     public String getImgPath(){
         return imgPath;
     }
     /**
-    * 璁剧疆 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
-    * @param imgPath
-    */
+     * 璁剧疆 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
+     * @param imgPath
+     */
     public void setImgPath(String imgPath){
         this.imgPath = imgPath;
     }
     /**
-    * 鑾峰彇 鎸夐挳鍥炬爣
-    * @return String
-    */
+     * 鑾峰彇 鎸夐挳鍥炬爣
+     * @return String
+     */
     public String getButtonImgPath(){
         return buttonImgPath;
     }
     /**
-    * 璁剧疆 鎸夐挳鍥炬爣
-    * @param buttonImgPath
-    */
+     * 璁剧疆 鎸夐挳鍥炬爣
+     * @param buttonImgPath
+     */
     public void setButtonImgPath(String buttonImgPath){
         this.buttonImgPath = buttonImgPath;
     }
     /**
-    * 鑾峰彇 甯哥敤鑿滃崟鍥炬爣
-    * @return String
-    */
+     * 鑾峰彇 甯哥敤鑿滃崟鍥炬爣
+     * @return String
+     */
     public String getImgCommPath(){
         return imgCommPath;
     }
     /**
-    * 璁剧疆 甯哥敤鑿滃崟鍥炬爣
-    * @param imgCommPath
-    */
+     * 璁剧疆 甯哥敤鑿滃崟鍥炬爣
+     * @param imgCommPath
+     */
     public void setImgCommPath(String imgCommPath){
         this.imgCommPath = imgCommPath;
     }
     /**
-    * 鑾峰彇 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @return Integer
-    */
+     * 鑾峰彇 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @return Integer
+     */
     public Integer getVisible(){
         return visible;
     }
     /**
-    * 璁剧疆 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @param visible
-    */
+     * 璁剧疆 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @param visible
+     */
     public void setVisible(Integer visible){
         this.visible = visible;
     }
     /**
-    * 鑾峰彇 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @return Integer
-    */
+     * 鑾峰彇 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @return Integer
+     */
     public Integer getMenuType(){
         return menuType;
     }
     /**
-    * 璁剧疆 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @param menuType
-    */
+     * 璁剧疆 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @param menuType
+     */
     public void setMenuType(Integer menuType){
         this.menuType = menuType;
     }
     /**
-    * 鑾峰彇 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @return Integer
-    */
+     * 鑾峰彇 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @return Integer
+     */
     public Integer getStatus(){
         return status;
     }
     /**
-    * 璁剧疆 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @param status
-    */
+     * 璁剧疆 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @param status
+     */
     public void setStatus(Integer status){
         this.status = status;
     }
     /**
-    * 鑾峰彇 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @return Integer
-    */
+     * 鑾峰彇 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @return Integer
+     */
     public Integer getAuthType(){
         return authType;
     }
     /**
-    * 璁剧疆 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @param authType
-    */
+     * 璁剧疆 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @param authType
+     */
     public void setAuthType(Integer authType){
         this.authType = authType;
     }
     /**
-    * 鑾峰彇 鎺掑簭缂栧彿
-    * @return Integer
-    */
+     * 鑾峰彇 鎺掑簭缂栧彿
+     * @return Integer
+     */
     public Integer getOrderId(){
         return orderId;
     }
     /**
-    * 璁剧疆 鎺掑簭缂栧彿
-    * @param orderId
-    */
+     * 璁剧疆 鎺掑簭缂栧彿
+     * @param orderId
+     */
     public void setOrderId(Integer orderId){
         this.orderId = orderId;
     }
     /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛鍚嶇О
-    * @return String
-    */
+     * 鑾峰彇 鍒涘缓鐢ㄦ埛鍚嶇О
+     * @return String
+     */
     public String getCreateUserName(){
         return createUserName;
     }
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
-    * @param createUserName
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
+     * @param createUserName
+     */
     public void setCreateUserName(String createUserName){
         this.createUserName = createUserName;
     }
+    /**
+     * 鑾峰彇 鎻忚堪澶囨敞
+     * @return String
+     */
+    public String getRemark(){
+        return remark;
+    }
+    /**
+     * 璁剧疆 鎻忚堪澶囨敞
+     * @param remark
+     */
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
 
 
 
 
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -268,7 +286,7 @@ public class MenuEntity extends MenuVo {
         if (obj instanceof MenuEntity) {
             MenuEntity tmp = (MenuEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -289,35 +307,38 @@ public class MenuEntity extends MenuVo {
         sb.append(",authType:").append(getAuthType());
         sb.append(",orderId:").append(getOrderId());
         sb.append(",createUserName:").append(getCreateUserName());
+        sb.append(",remark:").append(getRemark());
         return sb.toString();
     }
 
     public void initAttrValue(){
 
-            this.name = "";
+        this.name = "";
+
+        this.url = "";
 
-            this.url = "";
+        this.parentId = null;
 
-            this.parentId = null;
+        this.linkType = 0;
 
-            this.linkType = 0;
+        this.imgPath = "";
 
-            this.imgPath = "";
+        this.buttonImgPath = "";
 
-            this.buttonImgPath = "";
+        this.imgCommPath = "";
 
-            this.imgCommPath = "";
+        this.visible = 1;
 
-            this.visible = 1;
+        this.menuType = 0;
 
-            this.menuType = 0;
+        this.status = 1;
 
-            this.status = 1;
+        this.authType = 3;
 
-            this.authType = 3;
+        this.orderId = 0;
 
-            this.orderId = 0;
+        this.createUserName = "";
 
-            this.createUserName = "";
+        this.remark = "";
     }
 }
\ No newline at end of file
diff --git a/portal-manager/src/main/java/com/mortals/xhx/module/menu/model/MenuQuery.java b/portal-manager/src/main/java/com/mortals/xhx/module/menu/model/MenuQuery.java
index 78f97474..c8fd313f 100644
--- a/portal-manager/src/main/java/com/mortals/xhx/module/menu/model/MenuQuery.java
+++ b/portal-manager/src/main/java/com/mortals/xhx/module/menu/model/MenuQuery.java
@@ -3,11 +3,11 @@ package com.mortals.xhx.module.menu.model;
 import java.util.List;
 import com.mortals.xhx.module.menu.model.MenuEntity;
 /**
-* 鑿滃崟淇℃伅涓氬姟鏌ヨ瀵硅薄
-*
-* @author zxfei
-* @date 2022-06-02
-*/
+ * 鑿滃崟淇℃伅涓氬姟鏌ヨ瀵硅薄
+ *
+ * @author zxfei
+ * @date 2022-08-02
+ */
 public class MenuQuery extends MenuEntity {
     /** 寮€濮� 鑿滃崟ID锛屼富閿紝鑷闀� */
     private Long idStart;
@@ -141,6 +141,9 @@ public class MenuQuery extends MenuEntity {
     /** 鍒涘缓鐢ㄦ埛鍚嶇О */
     private List<String> createUserNameList;
 
+    /** 鎻忚堪澶囨敞 */
+    private List<String> remarkList;
+
     /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<MenuQuery> orConditionList;
 
@@ -150,1251 +153,1285 @@ public class MenuQuery extends MenuEntity {
     public MenuQuery(){}
 
     /**
-    * 鑾峰彇 寮€濮� 鑿滃崟ID锛屼富閿紝鑷闀�
-    * @return idStart
-    */
+     * 鑾峰彇 寮€濮� 鑿滃崟ID锛屼富閿紝鑷闀�
+     * @return idStart
+     */
     public Long getIdStart(){
         return this.idStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鑿滃崟ID锛屼富閿紝鑷闀�
-    * @param idStart
-    */
+     * 璁剧疆 寮€濮� 鑿滃崟ID锛屼富閿紝鑷闀�
+     * @param idStart
+     */
     public void setIdStart(Long idStart){
         this.idStart = idStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鑿滃崟ID锛屼富閿紝鑷闀�
-    * @return $idEnd
-    */
+     * 鑾峰彇 缁撴潫 鑿滃崟ID锛屼富閿紝鑷闀�
+     * @return $idEnd
+     */
     public Long getIdEnd(){
         return this.idEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鑿滃崟ID锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
+     * 璁剧疆 缁撴潫 鑿滃崟ID锛屼富閿紝鑷闀�
+     * @param idEnd
+     */
     public void setIdEnd(Long idEnd){
         this.idEnd = idEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鑿滃崟ID锛屼富閿紝鑷闀�
-    * @return idIncrement
-    */
+     * 鑾峰彇 澧炲姞 鑿滃崟ID锛屼富閿紝鑷闀�
+     * @return idIncrement
+     */
     public Long getIdIncrement(){
         return this.idIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鑿滃崟ID锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
+     * 璁剧疆 澧炲姞 鑿滃崟ID锛屼富閿紝鑷闀�
+     * @param idIncrement
+     */
     public void setIdIncrement(Long idIncrement){
         this.idIncrement = idIncrement;
     }
 
     /**
-    * 鑾峰彇 鑿滃崟ID锛屼富閿紝鑷闀�
-    * @return idList
-    */
+     * 鑾峰彇 鑿滃崟ID锛屼富閿紝鑷闀�
+     * @return idList
+     */
     public List<Long> getIdList(){
         return this.idList;
     }
 
     /**
-    * 璁剧疆 鑿滃崟ID锛屼富閿紝鑷闀�
-    * @param idList
-    */
+     * 璁剧疆 鑿滃崟ID锛屼富閿紝鑷闀�
+     * @param idList
+     */
     public void setIdList(List<Long> idList){
         this.idList = idList;
     }
 
     /**
-    * 鑾峰彇 鑿滃崟鍚嶇О
-    * @return nameList
-    */
+     * 鑾峰彇 鑿滃崟鍚嶇О
+     * @return nameList
+     */
     public List<String> getNameList(){
         return this.nameList;
     }
 
     /**
-    * 璁剧疆 鑿滃崟鍚嶇О
-    * @param nameList
-    */
+     * 璁剧疆 鑿滃崟鍚嶇О
+     * @param nameList
+     */
     public void setNameList(List<String> nameList){
         this.nameList = nameList;
     }
     /**
-    * 鑾峰彇 杩炴帴鍦板潃
-    * @return urlList
-    */
+     * 鑾峰彇 杩炴帴鍦板潃
+     * @return urlList
+     */
     public List<String> getUrlList(){
         return this.urlList;
     }
 
     /**
-    * 璁剧疆 杩炴帴鍦板潃
-    * @param urlList
-    */
+     * 璁剧疆 杩炴帴鍦板潃
+     * @param urlList
+     */
     public void setUrlList(List<String> urlList){
         this.urlList = urlList;
     }
     /**
-    * 鑾峰彇 寮€濮� 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @return parentIdStart
-    */
+     * 鑾峰彇 寮€濮� 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @return parentIdStart
+     */
     public Long getParentIdStart(){
         return this.parentIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @param parentIdStart
-    */
+     * 璁剧疆 寮€濮� 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @param parentIdStart
+     */
     public void setParentIdStart(Long parentIdStart){
         this.parentIdStart = parentIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @return $parentIdEnd
-    */
+     * 鑾峰彇 缁撴潫 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @return $parentIdEnd
+     */
     public Long getParentIdEnd(){
         return this.parentIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @param parentIdEnd
-    */
+     * 璁剧疆 缁撴潫 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @param parentIdEnd
+     */
     public void setParentIdEnd(Long parentIdEnd){
         this.parentIdEnd = parentIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @return parentIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @return parentIdIncrement
+     */
     public Long getParentIdIncrement(){
         return this.parentIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @param parentIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @param parentIdIncrement
+     */
     public void setParentIdIncrement(Long parentIdIncrement){
         this.parentIdIncrement = parentIdIncrement;
     }
 
     /**
-    * 鑾峰彇 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @return parentIdList
-    */
+     * 鑾峰彇 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @return parentIdList
+     */
     public List<Long> getParentIdList(){
         return this.parentIdList;
     }
 
     /**
-    * 璁剧疆 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @param parentIdList
-    */
+     * 璁剧疆 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @param parentIdList
+     */
     public void setParentIdList(List<Long> parentIdList){
         this.parentIdList = parentIdList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @return linkTypeStart
-    */
+     * 鑾峰彇 寮€濮� 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @return linkTypeStart
+     */
     public Integer getLinkTypeStart(){
         return this.linkTypeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @param linkTypeStart
-    */
+     * 璁剧疆 寮€濮� 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @param linkTypeStart
+     */
     public void setLinkTypeStart(Integer linkTypeStart){
         this.linkTypeStart = linkTypeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @return $linkTypeEnd
-    */
+     * 鑾峰彇 缁撴潫 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @return $linkTypeEnd
+     */
     public Integer getLinkTypeEnd(){
         return this.linkTypeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @param linkTypeEnd
-    */
+     * 璁剧疆 缁撴潫 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @param linkTypeEnd
+     */
     public void setLinkTypeEnd(Integer linkTypeEnd){
         this.linkTypeEnd = linkTypeEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @return linkTypeIncrement
-    */
+     * 鑾峰彇 澧炲姞 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @return linkTypeIncrement
+     */
     public Integer getLinkTypeIncrement(){
         return this.linkTypeIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @param linkTypeIncrement
-    */
+     * 璁剧疆 澧炲姞 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @param linkTypeIncrement
+     */
     public void setLinkTypeIncrement(Integer linkTypeIncrement){
         this.linkTypeIncrement = linkTypeIncrement;
     }
 
     /**
-    * 鑾峰彇 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @return linkTypeList
-    */
+     * 鑾峰彇 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @return linkTypeList
+     */
     public List<Integer> getLinkTypeList(){
         return this.linkTypeList;
     }
 
     /**
-    * 璁剧疆 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @param linkTypeList
-    */
+     * 璁剧疆 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @param linkTypeList
+     */
     public void setLinkTypeList(List<Integer> linkTypeList){
         this.linkTypeList = linkTypeList;
     }
 
     /**
-    * 鑾峰彇 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
-    * @return imgPathList
-    */
+     * 鑾峰彇 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
+     * @return imgPathList
+     */
     public List<String> getImgPathList(){
         return this.imgPathList;
     }
 
     /**
-    * 璁剧疆 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
-    * @param imgPathList
-    */
+     * 璁剧疆 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
+     * @param imgPathList
+     */
     public void setImgPathList(List<String> imgPathList){
         this.imgPathList = imgPathList;
     }
     /**
-    * 鑾峰彇 鎸夐挳鍥炬爣
-    * @return buttonImgPathList
-    */
+     * 鑾峰彇 鎸夐挳鍥炬爣
+     * @return buttonImgPathList
+     */
     public List<String> getButtonImgPathList(){
         return this.buttonImgPathList;
     }
 
     /**
-    * 璁剧疆 鎸夐挳鍥炬爣
-    * @param buttonImgPathList
-    */
+     * 璁剧疆 鎸夐挳鍥炬爣
+     * @param buttonImgPathList
+     */
     public void setButtonImgPathList(List<String> buttonImgPathList){
         this.buttonImgPathList = buttonImgPathList;
     }
     /**
-    * 鑾峰彇 甯哥敤鑿滃崟鍥炬爣
-    * @return imgCommPathList
-    */
+     * 鑾峰彇 甯哥敤鑿滃崟鍥炬爣
+     * @return imgCommPathList
+     */
     public List<String> getImgCommPathList(){
         return this.imgCommPathList;
     }
 
     /**
-    * 璁剧疆 甯哥敤鑿滃崟鍥炬爣
-    * @param imgCommPathList
-    */
+     * 璁剧疆 甯哥敤鑿滃崟鍥炬爣
+     * @param imgCommPathList
+     */
     public void setImgCommPathList(List<String> imgCommPathList){
         this.imgCommPathList = imgCommPathList;
     }
     /**
-    * 鑾峰彇 寮€濮� 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @return visibleStart
-    */
+     * 鑾峰彇 寮€濮� 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @return visibleStart
+     */
     public Integer getVisibleStart(){
         return this.visibleStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @param visibleStart
-    */
+     * 璁剧疆 寮€濮� 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @param visibleStart
+     */
     public void setVisibleStart(Integer visibleStart){
         this.visibleStart = visibleStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @return $visibleEnd
-    */
+     * 鑾峰彇 缁撴潫 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @return $visibleEnd
+     */
     public Integer getVisibleEnd(){
         return this.visibleEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @param visibleEnd
-    */
+     * 璁剧疆 缁撴潫 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @param visibleEnd
+     */
     public void setVisibleEnd(Integer visibleEnd){
         this.visibleEnd = visibleEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @return visibleIncrement
-    */
+     * 鑾峰彇 澧炲姞 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @return visibleIncrement
+     */
     public Integer getVisibleIncrement(){
         return this.visibleIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @param visibleIncrement
-    */
+     * 璁剧疆 澧炲姞 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @param visibleIncrement
+     */
     public void setVisibleIncrement(Integer visibleIncrement){
         this.visibleIncrement = visibleIncrement;
     }
 
     /**
-    * 鑾峰彇 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @return visibleList
-    */
+     * 鑾峰彇 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @return visibleList
+     */
     public List<Integer> getVisibleList(){
         return this.visibleList;
     }
 
     /**
-    * 璁剧疆 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @param visibleList
-    */
+     * 璁剧疆 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @param visibleList
+     */
     public void setVisibleList(List<Integer> visibleList){
         this.visibleList = visibleList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @return menuTypeStart
-    */
+     * 鑾峰彇 寮€濮� 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @return menuTypeStart
+     */
     public Integer getMenuTypeStart(){
         return this.menuTypeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @param menuTypeStart
-    */
+     * 璁剧疆 寮€濮� 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @param menuTypeStart
+     */
     public void setMenuTypeStart(Integer menuTypeStart){
         this.menuTypeStart = menuTypeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @return $menuTypeEnd
-    */
+     * 鑾峰彇 缁撴潫 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @return $menuTypeEnd
+     */
     public Integer getMenuTypeEnd(){
         return this.menuTypeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @param menuTypeEnd
-    */
+     * 璁剧疆 缁撴潫 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @param menuTypeEnd
+     */
     public void setMenuTypeEnd(Integer menuTypeEnd){
         this.menuTypeEnd = menuTypeEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @return menuTypeIncrement
-    */
+     * 鑾峰彇 澧炲姞 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @return menuTypeIncrement
+     */
     public Integer getMenuTypeIncrement(){
         return this.menuTypeIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @param menuTypeIncrement
-    */
+     * 璁剧疆 澧炲姞 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @param menuTypeIncrement
+     */
     public void setMenuTypeIncrement(Integer menuTypeIncrement){
         this.menuTypeIncrement = menuTypeIncrement;
     }
 
     /**
-    * 鑾峰彇 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @return menuTypeList
-    */
+     * 鑾峰彇 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @return menuTypeList
+     */
     public List<Integer> getMenuTypeList(){
         return this.menuTypeList;
     }
 
     /**
-    * 璁剧疆 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @param menuTypeList
-    */
+     * 璁剧疆 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @param menuTypeList
+     */
     public void setMenuTypeList(List<Integer> menuTypeList){
         this.menuTypeList = menuTypeList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @return statusStart
-    */
+     * 鑾峰彇 寮€濮� 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @return statusStart
+     */
     public Integer getStatusStart(){
         return this.statusStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @param statusStart
-    */
+     * 璁剧疆 寮€濮� 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @param statusStart
+     */
     public void setStatusStart(Integer statusStart){
         this.statusStart = statusStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @return $statusEnd
-    */
+     * 鑾峰彇 缁撴潫 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @return $statusEnd
+     */
     public Integer getStatusEnd(){
         return this.statusEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @param statusEnd
-    */
+     * 璁剧疆 缁撴潫 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @param statusEnd
+     */
     public void setStatusEnd(Integer statusEnd){
         this.statusEnd = statusEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @return statusIncrement
-    */
+     * 鑾峰彇 澧炲姞 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @return statusIncrement
+     */
     public Integer getStatusIncrement(){
         return this.statusIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @param statusIncrement
-    */
+     * 璁剧疆 澧炲姞 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @param statusIncrement
+     */
     public void setStatusIncrement(Integer statusIncrement){
         this.statusIncrement = statusIncrement;
     }
 
     /**
-    * 鑾峰彇 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @return statusList
-    */
+     * 鑾峰彇 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @return statusList
+     */
     public List<Integer> getStatusList(){
         return this.statusList;
     }
 
     /**
-    * 璁剧疆 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @param statusList
-    */
+     * 璁剧疆 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @param statusList
+     */
     public void setStatusList(List<Integer> statusList){
         this.statusList = statusList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @return authTypeStart
-    */
+     * 鑾峰彇 寮€濮� 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @return authTypeStart
+     */
     public Integer getAuthTypeStart(){
         return this.authTypeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @param authTypeStart
-    */
+     * 璁剧疆 寮€濮� 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @param authTypeStart
+     */
     public void setAuthTypeStart(Integer authTypeStart){
         this.authTypeStart = authTypeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @return $authTypeEnd
-    */
+     * 鑾峰彇 缁撴潫 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @return $authTypeEnd
+     */
     public Integer getAuthTypeEnd(){
         return this.authTypeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @param authTypeEnd
-    */
+     * 璁剧疆 缁撴潫 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @param authTypeEnd
+     */
     public void setAuthTypeEnd(Integer authTypeEnd){
         this.authTypeEnd = authTypeEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @return authTypeIncrement
-    */
+     * 鑾峰彇 澧炲姞 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @return authTypeIncrement
+     */
     public Integer getAuthTypeIncrement(){
         return this.authTypeIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @param authTypeIncrement
-    */
+     * 璁剧疆 澧炲姞 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @param authTypeIncrement
+     */
     public void setAuthTypeIncrement(Integer authTypeIncrement){
         this.authTypeIncrement = authTypeIncrement;
     }
 
     /**
-    * 鑾峰彇 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @return authTypeList
-    */
+     * 鑾峰彇 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @return authTypeList
+     */
     public List<Integer> getAuthTypeList(){
         return this.authTypeList;
     }
 
     /**
-    * 璁剧疆 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @param authTypeList
-    */
+     * 璁剧疆 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @param authTypeList
+     */
     public void setAuthTypeList(List<Integer> authTypeList){
         this.authTypeList = authTypeList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鎺掑簭缂栧彿
-    * @return orderIdStart
-    */
+     * 鑾峰彇 寮€濮� 鎺掑簭缂栧彿
+     * @return orderIdStart
+     */
     public Integer getOrderIdStart(){
         return this.orderIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鎺掑簭缂栧彿
-    * @param orderIdStart
-    */
+     * 璁剧疆 寮€濮� 鎺掑簭缂栧彿
+     * @param orderIdStart
+     */
     public void setOrderIdStart(Integer orderIdStart){
         this.orderIdStart = orderIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鎺掑簭缂栧彿
-    * @return $orderIdEnd
-    */
+     * 鑾峰彇 缁撴潫 鎺掑簭缂栧彿
+     * @return $orderIdEnd
+     */
     public Integer getOrderIdEnd(){
         return this.orderIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鎺掑簭缂栧彿
-    * @param orderIdEnd
-    */
+     * 璁剧疆 缁撴潫 鎺掑簭缂栧彿
+     * @param orderIdEnd
+     */
     public void setOrderIdEnd(Integer orderIdEnd){
         this.orderIdEnd = orderIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鎺掑簭缂栧彿
-    * @return orderIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 鎺掑簭缂栧彿
+     * @return orderIdIncrement
+     */
     public Integer getOrderIdIncrement(){
         return this.orderIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鎺掑簭缂栧彿
-    * @param orderIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鎺掑簭缂栧彿
+     * @param orderIdIncrement
+     */
     public void setOrderIdIncrement(Integer orderIdIncrement){
         this.orderIdIncrement = orderIdIncrement;
     }
 
     /**
-    * 鑾峰彇 鎺掑簭缂栧彿
-    * @return orderIdList
-    */
+     * 鑾峰彇 鎺掑簭缂栧彿
+     * @return orderIdList
+     */
     public List<Integer> getOrderIdList(){
         return this.orderIdList;
     }
 
     /**
-    * 璁剧疆 鎺掑簭缂栧彿
-    * @param orderIdList
-    */
+     * 璁剧疆 鎺掑簭缂栧彿
+     * @param orderIdList
+     */
     public void setOrderIdList(List<Integer> orderIdList){
         this.orderIdList = orderIdList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
-    * @return createTimeStart
-    */
+     * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
+     * @return createTimeStart
+     */
     public String getCreateTimeStart(){
         return this.createTimeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
-    * @param createTimeStart
-    */
+     * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
+     * @param createTimeStart
+     */
     public void setCreateTimeStart(String createTimeStart){
         this.createTimeStart = createTimeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
-    * @return createTimeEnd
-    */
+     * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
+     * @return createTimeEnd
+     */
     public String getCreateTimeEnd(){
         return this.createTimeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
-    * @param createTimeEnd
-    */
+     * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
+     * @param createTimeEnd
+     */
     public void setCreateTimeEnd(String createTimeEnd){
         this.createTimeEnd = createTimeEnd;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @return createUserIdStart
-    */
+     * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @return createUserIdStart
+     */
     public Long getCreateUserIdStart(){
         return this.createUserIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
+     * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @param createUserIdStart
+     */
     public void setCreateUserIdStart(Long createUserIdStart){
         this.createUserIdStart = createUserIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @return $createUserIdEnd
-    */
+     * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @return $createUserIdEnd
+     */
     public Long getCreateUserIdEnd(){
         return this.createUserIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
+     * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @param createUserIdEnd
+     */
     public void setCreateUserIdEnd(Long createUserIdEnd){
         this.createUserIdEnd = createUserIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @return createUserIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @return createUserIdIncrement
+     */
     public Long getCreateUserIdIncrement(){
         return this.createUserIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @param createUserIdIncrement
+     */
     public void setCreateUserIdIncrement(Long createUserIdIncrement){
         this.createUserIdIncrement = createUserIdIncrement;
     }
 
     /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛
-    * @return createUserIdList
-    */
+     * 鑾峰彇 鍒涘缓鐢ㄦ埛
+     * @return createUserIdList
+     */
     public List<Long> getCreateUserIdList(){
         return this.createUserIdList;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdList
+     */
     public void setCreateUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
     }
 
     /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛鍚嶇О
-    * @return createUserNameList
-    */
+     * 鑾峰彇 鍒涘缓鐢ㄦ埛鍚嶇О
+     * @return createUserNameList
+     */
     public List<String> getCreateUserNameList(){
         return this.createUserNameList;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
-    * @param createUserNameList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
+     * @param createUserNameList
+     */
     public void setCreateUserNameList(List<String> createUserNameList){
         this.createUserNameList = createUserNameList;
     }
     /**
-    * 璁剧疆  鑿滃崟ID锛屼富閿紝鑷闀�
-    * @param id
-    */
+     * 鑾峰彇 鎻忚堪澶囨敞
+     * @return remarkList
+     */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+     * 璁剧疆 鎻忚堪澶囨敞
+     * @param remarkList
+     */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+    /**
+     * 璁剧疆  鑿滃崟ID锛屼富閿紝鑷闀�
+     * @param id
+     */
     public MenuQuery id(Long id){
-	    setId(id);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鑿滃崟ID锛屼富閿紝鑷闀�
-    * @param idStart
-    */
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鑿滃崟ID锛屼富閿紝鑷闀�
+     * @param idStart
+     */
     public MenuQuery idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
+        this.idStart = idStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鑿滃崟ID锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
+     * 璁剧疆 缁撴潫 鑿滃崟ID锛屼富閿紝鑷闀�
+     * @param idEnd
+     */
     public MenuQuery idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
+        this.idEnd = idEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鑿滃崟ID锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
+     * 璁剧疆 澧炲姞 鑿滃崟ID锛屼富閿紝鑷闀�
+     * @param idIncrement
+     */
     public MenuQuery idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
+        this.idIncrement = idIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鑿滃崟ID锛屼富閿紝鑷闀�
-    * @param idList
-    */
+     * 璁剧疆 鑿滃崟ID锛屼富閿紝鑷闀�
+     * @param idList
+     */
     public MenuQuery idList(List<Long> idList){
         this.idList = idList;
-		return this;
-        }
+        return this;
+    }
 
 
-	/**
-    * 璁剧疆 鑿滃崟鍚嶇О
-    * @param name
-    */
+    /**
+     * 璁剧疆 鑿滃崟鍚嶇О
+     * @param name
+     */
     public MenuQuery name(String name){
         setName(name);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鑿滃崟鍚嶇О
-    * @param nameList
-    */
+     * 璁剧疆 鑿滃崟鍚嶇О
+     * @param nameList
+     */
     public MenuQuery nameList(List<String> nameList){
         this.nameList = nameList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 杩炴帴鍦板潃
-    * @param url
-    */
+    /**
+     * 璁剧疆 杩炴帴鍦板潃
+     * @param url
+     */
     public MenuQuery url(String url){
         setUrl(url);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 杩炴帴鍦板潃
-    * @param urlList
-    */
+     * 璁剧疆 杩炴帴鍦板潃
+     * @param urlList
+     */
     public MenuQuery urlList(List<String> urlList){
         this.urlList = urlList;
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆  鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @param parentId
-    */
+     * 璁剧疆  鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @param parentId
+     */
     public MenuQuery parentId(Long parentId){
-	    setParentId(parentId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @param parentIdStart
-    */
+        setParentId(parentId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @param parentIdStart
+     */
     public MenuQuery parentIdStart(Long parentIdStart){
-		this.parentIdStart = parentIdStart;
-		return this;
+        this.parentIdStart = parentIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @param parentIdEnd
-    */
+     * 璁剧疆 缁撴潫 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @param parentIdEnd
+     */
     public MenuQuery parentIdEnd(Long parentIdEnd){
-		this.parentIdEnd = parentIdEnd;
-		return this;
+        this.parentIdEnd = parentIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @param parentIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @param parentIdIncrement
+     */
     public MenuQuery parentIdIncrement(Long parentIdIncrement){
-		this.parentIdIncrement = parentIdIncrement;
-		return this;
+        this.parentIdIncrement = parentIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
-    * @param parentIdList
-    */
+     * 璁剧疆 鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1
+     * @param parentIdList
+     */
     public MenuQuery parentIdList(List<Long> parentIdList){
         this.parentIdList = parentIdList;
-		return this;
-        }
+        return this;
+    }
 
     /**
-    * 璁剧疆  閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @param linkType
-    */
+     * 璁剧疆  閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @param linkType
+     */
     public MenuQuery linkType(Integer linkType){
-	    setLinkType(linkType);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @param linkTypeStart
-    */
+        setLinkType(linkType);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @param linkTypeStart
+     */
     public MenuQuery linkTypeStart(Integer linkTypeStart){
-		this.linkTypeStart = linkTypeStart;
-		return this;
+        this.linkTypeStart = linkTypeStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @param linkTypeEnd
-    */
+     * 璁剧疆 缁撴潫 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @param linkTypeEnd
+     */
     public MenuQuery linkTypeEnd(Integer linkTypeEnd){
-		this.linkTypeEnd = linkTypeEnd;
-		return this;
+        this.linkTypeEnd = linkTypeEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @param linkTypeIncrement
-    */
+     * 璁剧疆 澧炲姞 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @param linkTypeIncrement
+     */
     public MenuQuery linkTypeIncrement(Integer linkTypeIncrement){
-		this.linkTypeIncrement = linkTypeIncrement;
-		return this;
+        this.linkTypeIncrement = linkTypeIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
-    * @param linkTypeList
-    */
+     * 璁剧疆 閾炬帴鏂瑰紡锛�(0.鏅€氾紝1.寮瑰嚭锛�2.鑴氭湰)
+     * @param linkTypeList
+     */
     public MenuQuery linkTypeList(List<Integer> linkTypeList){
         this.linkTypeList = linkTypeList;
-		return this;
-        }
+        return this;
+    }
 
 
-	/**
-    * 璁剧疆 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
-    * @param imgPath
-    */
+    /**
+     * 璁剧疆 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
+     * @param imgPath
+     */
     public MenuQuery imgPath(String imgPath){
         setImgPath(imgPath);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
-    * @param imgPathList
-    */
+     * 璁剧疆 涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�
+     * @param imgPathList
+     */
     public MenuQuery imgPathList(List<String> imgPathList){
         this.imgPathList = imgPathList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 鎸夐挳鍥炬爣
-    * @param buttonImgPath
-    */
+    /**
+     * 璁剧疆 鎸夐挳鍥炬爣
+     * @param buttonImgPath
+     */
     public MenuQuery buttonImgPath(String buttonImgPath){
         setButtonImgPath(buttonImgPath);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鎸夐挳鍥炬爣
-    * @param buttonImgPathList
-    */
+     * 璁剧疆 鎸夐挳鍥炬爣
+     * @param buttonImgPathList
+     */
     public MenuQuery buttonImgPathList(List<String> buttonImgPathList){
         this.buttonImgPathList = buttonImgPathList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 甯哥敤鑿滃崟鍥炬爣
-    * @param imgCommPath
-    */
+    /**
+     * 璁剧疆 甯哥敤鑿滃崟鍥炬爣
+     * @param imgCommPath
+     */
     public MenuQuery imgCommPath(String imgCommPath){
         setImgCommPath(imgCommPath);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 甯哥敤鑿滃崟鍥炬爣
-    * @param imgCommPathList
-    */
+     * 璁剧疆 甯哥敤鑿滃崟鍥炬爣
+     * @param imgCommPathList
+     */
     public MenuQuery imgCommPathList(List<String> imgCommPathList){
         this.imgCommPathList = imgCommPathList;
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆  鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @param visible
-    */
+     * 璁剧疆  鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @param visible
+     */
     public MenuQuery visible(Integer visible){
-	    setVisible(visible);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @param visibleStart
-    */
+        setVisible(visible);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @param visibleStart
+     */
     public MenuQuery visibleStart(Integer visibleStart){
-		this.visibleStart = visibleStart;
-		return this;
+        this.visibleStart = visibleStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @param visibleEnd
-    */
+     * 璁剧疆 缁撴潫 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @param visibleEnd
+     */
     public MenuQuery visibleEnd(Integer visibleEnd){
-		this.visibleEnd = visibleEnd;
-		return this;
+        this.visibleEnd = visibleEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @param visibleIncrement
-    */
+     * 璁剧疆 澧炲姞 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @param visibleIncrement
+     */
     public MenuQuery visibleIncrement(Integer visibleIncrement){
-		this.visibleIncrement = visibleIncrement;
-		return this;
+        this.visibleIncrement = visibleIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
-    * @param visibleList
-    */
+     * 璁剧疆 鑿滃崟鏄剧ず(0.闅愯棌锛�1.鏄剧ず)
+     * @param visibleList
+     */
     public MenuQuery visibleList(List<Integer> visibleList){
         this.visibleList = visibleList;
-		return this;
-        }
+        return this;
+    }
 
     /**
-    * 璁剧疆  鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @param menuType
-    */
+     * 璁剧疆  鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @param menuType
+     */
     public MenuQuery menuType(Integer menuType){
-	    setMenuType(menuType);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @param menuTypeStart
-    */
+        setMenuType(menuType);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @param menuTypeStart
+     */
     public MenuQuery menuTypeStart(Integer menuTypeStart){
-		this.menuTypeStart = menuTypeStart;
-		return this;
+        this.menuTypeStart = menuTypeStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @param menuTypeEnd
-    */
+     * 璁剧疆 缁撴潫 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @param menuTypeEnd
+     */
     public MenuQuery menuTypeEnd(Integer menuTypeEnd){
-		this.menuTypeEnd = menuTypeEnd;
-		return this;
+        this.menuTypeEnd = menuTypeEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @param menuTypeIncrement
-    */
+     * 璁剧疆 澧炲姞 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @param menuTypeIncrement
+     */
     public MenuQuery menuTypeIncrement(Integer menuTypeIncrement){
-		this.menuTypeIncrement = menuTypeIncrement;
-		return this;
+        this.menuTypeIncrement = menuTypeIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
-    * @param menuTypeList
-    */
+     * 璁剧疆 鑿滃崟绫诲瀷(0.鐩綍锛�1.鑿滃崟锛�2.鎸夐挳)
+     * @param menuTypeList
+     */
     public MenuQuery menuTypeList(List<Integer> menuTypeList){
         this.menuTypeList = menuTypeList;
-		return this;
-        }
+        return this;
+    }
 
     /**
-    * 璁剧疆  鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @param status
-    */
+     * 璁剧疆  鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @param status
+     */
     public MenuQuery status(Integer status){
-	    setStatus(status);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @param statusStart
-    */
+        setStatus(status);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @param statusStart
+     */
     public MenuQuery statusStart(Integer statusStart){
-		this.statusStart = statusStart;
-		return this;
+        this.statusStart = statusStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @param statusEnd
-    */
+     * 璁剧疆 缁撴潫 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @param statusEnd
+     */
     public MenuQuery statusEnd(Integer statusEnd){
-		this.statusEnd = statusEnd;
-		return this;
+        this.statusEnd = statusEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @param statusIncrement
-    */
+     * 璁剧疆 澧炲姞 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @param statusIncrement
+     */
     public MenuQuery statusIncrement(Integer statusIncrement){
-		this.statusIncrement = statusIncrement;
-		return this;
+        this.statusIncrement = statusIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
-    * @param statusList
-    */
+     * 璁剧疆 鑿滃崟鐘舵€�(0.绂佺敤锛�1.鍚敤)
+     * @param statusList
+     */
     public MenuQuery statusList(List<Integer> statusList){
         this.statusList = statusList;
-		return this;
-        }
+        return this;
+    }
 
     /**
-    * 璁剧疆  鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @param authType
-    */
+     * 璁剧疆  鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @param authType
+     */
     public MenuQuery authType(Integer authType){
-	    setAuthType(authType);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @param authTypeStart
-    */
+        setAuthType(authType);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @param authTypeStart
+     */
     public MenuQuery authTypeStart(Integer authTypeStart){
-		this.authTypeStart = authTypeStart;
-		return this;
+        this.authTypeStart = authTypeStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @param authTypeEnd
-    */
+     * 璁剧疆 缁撴潫 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @param authTypeEnd
+     */
     public MenuQuery authTypeEnd(Integer authTypeEnd){
-		this.authTypeEnd = authTypeEnd;
-		return this;
+        this.authTypeEnd = authTypeEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @param authTypeIncrement
-    */
+     * 璁剧疆 澧炲姞 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @param authTypeIncrement
+     */
     public MenuQuery authTypeIncrement(Integer authTypeIncrement){
-		this.authTypeIncrement = authTypeIncrement;
-		return this;
+        this.authTypeIncrement = authTypeIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
-    * @param authTypeList
-    */
+     * 璁剧疆 鏉冮檺绫诲瀷(0.鏃犻檺鍒讹紝1.鏃犻渶鐧诲綍鏌ョ湅锛�2.闇€瑕佺櫥褰曟煡鐪嬶紝3.闇€瑕佽鑹叉潈闄愭煡鐪�)
+     * @param authTypeList
+     */
     public MenuQuery authTypeList(List<Integer> authTypeList){
         this.authTypeList = authTypeList;
-		return this;
-        }
+        return this;
+    }
 
     /**
-    * 璁剧疆  鎺掑簭缂栧彿
-    * @param orderId
-    */
+     * 璁剧疆  鎺掑簭缂栧彿
+     * @param orderId
+     */
     public MenuQuery orderId(Integer orderId){
-	    setOrderId(orderId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鎺掑簭缂栧彿
-    * @param orderIdStart
-    */
+        setOrderId(orderId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鎺掑簭缂栧彿
+     * @param orderIdStart
+     */
     public MenuQuery orderIdStart(Integer orderIdStart){
-		this.orderIdStart = orderIdStart;
-		return this;
+        this.orderIdStart = orderIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鎺掑簭缂栧彿
-    * @param orderIdEnd
-    */
+     * 璁剧疆 缁撴潫 鎺掑簭缂栧彿
+     * @param orderIdEnd
+     */
     public MenuQuery orderIdEnd(Integer orderIdEnd){
-		this.orderIdEnd = orderIdEnd;
-		return this;
+        this.orderIdEnd = orderIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鎺掑簭缂栧彿
-    * @param orderIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鎺掑簭缂栧彿
+     * @param orderIdIncrement
+     */
     public MenuQuery orderIdIncrement(Integer orderIdIncrement){
-		this.orderIdIncrement = orderIdIncrement;
-		return this;
+        this.orderIdIncrement = orderIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鎺掑簭缂栧彿
-    * @param orderIdList
-    */
+     * 璁剧疆 鎺掑簭缂栧彿
+     * @param orderIdList
+     */
     public MenuQuery orderIdList(List<Integer> orderIdList){
         this.orderIdList = orderIdList;
-		return this;
-        }
+        return this;
+    }
 
 
     /**
-    * 璁剧疆  鍒涘缓鐢ㄦ埛
-    * @param createUserId
-    */
+     * 璁剧疆  鍒涘缓鐢ㄦ埛
+     * @param createUserId
+     */
     public MenuQuery createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
+        setCreateUserId(createUserId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @param createUserIdStart
+     */
     public MenuQuery createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
-		return this;
+        this.createUserIdStart = createUserIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
+     * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @param createUserIdEnd
+     */
     public MenuQuery createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
-		return this;
+        this.createUserIdEnd = createUserIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @param createUserIdIncrement
+     */
     public MenuQuery createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
-		return this;
+        this.createUserIdIncrement = createUserIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdList
+     */
     public MenuQuery createUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
-		return this;
-        }
+        return this;
+    }
 
 
-	/**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
-    * @param createUserName
-    */
+    /**
+     * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
+     * @param createUserName
+     */
     public MenuQuery createUserName(String createUserName){
         setCreateUserName(createUserName);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
-    * @param createUserNameList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
+     * @param createUserNameList
+     */
     public MenuQuery createUserNameList(List<String> createUserNameList){
         this.createUserNameList = createUserNameList;
-		return this;
+        return this;
+    }
+
+
+    /**
+     * 璁剧疆 鎻忚堪澶囨敞
+     * @param remark
+     */
+    public MenuQuery remark(String remark){
+        setRemark(remark);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鎻忚堪澶囨敞
+     * @param remarkList
+     */
+    public MenuQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+        return this;
     }
 
     /**
-    * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
+     * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
     public List<MenuQuery> getOrConditionList(){
-    return this.orConditionList;
+        return this.orConditionList;
     }
 
     /**
-    * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param orConditionList
-    */
+     * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @param orConditionList
+     */
     public void setOrConditionList(List<MenuQuery> orConditionList){
         this.orConditionList = orConditionList;
     }
 
     /**
-    * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
+     * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
     public List<MenuQuery> getAndConditionList(){
         return this.andConditionList;
     }
 
     /**
-    * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param andConditionList
-    */
+     * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @param andConditionList
+     */
     public void setAndConditionList(List<MenuQuery> andConditionList){
         this.andConditionList = andConditionList;
     }
diff --git a/portal-manager/src/main/resources/sqlmap/module/menu/MenuMapper.xml b/portal-manager/src/main/resources/sqlmap/module/menu/MenuMapper.xml
index ae5af9c0..b90e12d0 100644
--- a/portal-manager/src/main/resources/sqlmap/module/menu/MenuMapper.xml
+++ b/portal-manager/src/main/resources/sqlmap/module/menu/MenuMapper.xml
@@ -1,98 +1,102 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.menu.dao.ibatis.MenuDaoImpl">
 
     <!-- 瀛楁鍜屽睘鎬ф槧灏� -->
     <resultMap type="MenuEntity" id="MenuEntity-Map">
-            <id  property="id" column="id" />
-            <result property="name" column="name" />
-            <result property="url" column="url" />
-            <result property="parentId" column="parentId" />
-            <result property="linkType" column="linkType" />
-            <result property="imgPath" column="imgPath" />
-            <result property="buttonImgPath" column="buttonImgPath" />
-            <result property="imgCommPath" column="imgCommPath" />
-            <result property="visible" column="visible" />
-            <result property="menuType" column="menuType" />
-            <result property="status" column="status" />
-            <result property="authType" column="authType" />
-            <result property="orderId" column="orderId" />
-            <result property="createTime" column="createTime" />
-            <result property="createUserId" column="createUserId" />
-            <result property="createUserName" column="createUserName" />
-            
+        <id  property="id" column="id" />
+        <result property="name" column="name" />
+        <result property="url" column="url" />
+        <result property="parentId" column="parentId" />
+        <result property="linkType" column="linkType" />
+        <result property="imgPath" column="imgPath" />
+        <result property="buttonImgPath" column="buttonImgPath" />
+        <result property="imgCommPath" column="imgCommPath" />
+        <result property="visible" column="visible" />
+        <result property="menuType" column="menuType" />
+        <result property="status" column="status" />
+        <result property="authType" column="authType" />
+        <result property="orderId" column="orderId" />
+        <result property="createTime" column="createTime" />
+        <result property="createUserId" column="createUserId" />
+        <result property="createUserName" column="createUserName" />
+        <result property="remark" column="remark" />
+
     </resultMap>
 
 
     <!-- 琛ㄦ墍鏈夊垪 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
-                    a.id,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
-                    a.name,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))">
-                    a.url,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('parentId') or colPickMode == 1 and data.containsKey('parentId')))">
-                    a.parentId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('linkType') or colPickMode == 1 and data.containsKey('linkType')))">
-                    a.linkType,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('imgPath') or colPickMode == 1 and data.containsKey('imgPath')))">
-                    a.imgPath,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('buttonImgPath') or colPickMode == 1 and data.containsKey('buttonImgPath')))">
-                    a.buttonImgPath,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('imgCommPath') or colPickMode == 1 and data.containsKey('imgCommPath')))">
-                    a.imgCommPath,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('visible') or colPickMode == 1 and data.containsKey('visible')))">
-                    a.visible,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('menuType') or colPickMode == 1 and data.containsKey('menuType')))">
-                    a.menuType,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
-                    a.status,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('authType') or colPickMode == 1 and data.containsKey('authType')))">
-                    a.authType,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderId') or colPickMode == 1 and data.containsKey('orderId')))">
-                    a.orderId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
-                    a.createTime,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
-                    a.createUserId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))">
-                    a.createUserName,
-                </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                a.id,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                a.name,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))">
+                a.url,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('parentId') or colPickMode == 1 and data.containsKey('parentId')))">
+                a.parentId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('linkType') or colPickMode == 1 and data.containsKey('linkType')))">
+                a.linkType,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('imgPath') or colPickMode == 1 and data.containsKey('imgPath')))">
+                a.imgPath,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('buttonImgPath') or colPickMode == 1 and data.containsKey('buttonImgPath')))">
+                a.buttonImgPath,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('imgCommPath') or colPickMode == 1 and data.containsKey('imgCommPath')))">
+                a.imgCommPath,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('visible') or colPickMode == 1 and data.containsKey('visible')))">
+                a.visible,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('menuType') or colPickMode == 1 and data.containsKey('menuType')))">
+                a.menuType,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
+                a.status,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('authType') or colPickMode == 1 and data.containsKey('authType')))">
+                a.authType,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderId') or colPickMode == 1 and data.containsKey('orderId')))">
+                a.orderId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                a.createTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                a.createUserId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))">
+                a.createUserName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                a.remark,
+            </if>
         </trim>
     </sql>
     <!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
     <insert id="insert" parameterType="MenuEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_menu
-        (name,url,parentId,linkType,imgPath,buttonImgPath,imgCommPath,visible,menuType,status,authType,orderId,createTime,createUserId,createUserName)
+        (name,url,parentId,linkType,imgPath,buttonImgPath,imgCommPath,visible,menuType,status,authType,orderId,createTime,createUserId,createUserName,remark)
         VALUES
-        (#{name},#{url},#{parentId},#{linkType},#{imgPath},#{buttonImgPath},#{imgCommPath},#{visible},#{menuType},#{status},#{authType},#{orderId},#{createTime},#{createUserId},#{createUserName})
+        (#{name},#{url},#{parentId},#{linkType},#{imgPath},#{buttonImgPath},#{imgCommPath},#{visible},#{menuType},#{status},#{authType},#{orderId},#{createTime},#{createUserId},#{createUserName},#{remark})
     </insert>
 
     <!-- 鎵归噺鏂板 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_menu
-        (name,url,parentId,linkType,imgPath,buttonImgPath,imgCommPath,visible,menuType,status,authType,orderId,createTime,createUserId,createUserName)
+        (name,url,parentId,linkType,imgPath,buttonImgPath,imgCommPath,visible,menuType,status,authType,orderId,createTime,createUserId,createUserName,remark)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.name},#{item.url},#{item.parentId},#{item.linkType},#{item.imgPath},#{item.buttonImgPath},#{item.imgCommPath},#{item.visible},#{item.menuType},#{item.status},#{item.authType},#{item.orderId},#{item.createTime},#{item.createUserId},#{item.createUserName})
+            (#{item.name},#{item.url},#{item.parentId},#{item.linkType},#{item.imgPath},#{item.buttonImgPath},#{item.imgCommPath},#{item.visible},#{item.menuType},#{item.status},#{item.authType},#{item.orderId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.remark})
         </foreach>
     </insert>
 
@@ -171,6 +175,9 @@
             <if test="(colPickMode==0 and data.containsKey('createUserName')) or (colPickMode==1 and !data.containsKey('createUserName'))">
                 a.createUserName=#{data.createUserName},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
+                a.remark=#{data.remark},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -183,151 +190,158 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_menu as a
         <trim prefix="set" suffixOverrides=",">
-                <trim prefix="name=(case" suffix="ELSE name end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
-                            when a.id=#{item.id} then #{item.name}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="url=(case" suffix="ELSE url end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('url')) or (colPickMode==1 and !item.containsKey('url'))">
-                            when a.id=#{item.id} then #{item.url}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="parentId=(case" suffix="ELSE parentId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('parentId')) or (colPickMode==1 and !item.containsKey('parentId'))">
-                                        when a.id=#{item.id} then #{item.parentId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('parentIdIncrement')) or (colPickMode==1 and !item.containsKey('parentIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.parentId,0) + #{item.parentIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="linkType=(case" suffix="ELSE linkType end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('linkType')) or (colPickMode==1 and !item.containsKey('linkType'))">
-                                        when a.id=#{item.id} then #{item.linkType}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('linkTypeIncrement')) or (colPickMode==1 and !item.containsKey('linkTypeIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.linkType,0) + #{item.linkTypeIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="imgPath=(case" suffix="ELSE imgPath end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('imgPath')) or (colPickMode==1 and !item.containsKey('imgPath'))">
-                            when a.id=#{item.id} then #{item.imgPath}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="buttonImgPath=(case" suffix="ELSE buttonImgPath end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('buttonImgPath')) or (colPickMode==1 and !item.containsKey('buttonImgPath'))">
-                            when a.id=#{item.id} then #{item.buttonImgPath}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="imgCommPath=(case" suffix="ELSE imgCommPath end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('imgCommPath')) or (colPickMode==1 and !item.containsKey('imgCommPath'))">
-                            when a.id=#{item.id} then #{item.imgCommPath}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="visible=(case" suffix="ELSE visible end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('visible')) or (colPickMode==1 and !item.containsKey('visible'))">
-                                        when a.id=#{item.id} then #{item.visible}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('visibleIncrement')) or (colPickMode==1 and !item.containsKey('visibleIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.visible,0) + #{item.visibleIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="menuType=(case" suffix="ELSE menuType end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('menuType')) or (colPickMode==1 and !item.containsKey('menuType'))">
-                                        when a.id=#{item.id} then #{item.menuType}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('menuTypeIncrement')) or (colPickMode==1 and !item.containsKey('menuTypeIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.menuType,0) + #{item.menuTypeIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="status=(case" suffix="ELSE status end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
-                                        when a.id=#{item.id} then #{item.status}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="authType=(case" suffix="ELSE authType end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('authType')) or (colPickMode==1 and !item.containsKey('authType'))">
-                                        when a.id=#{item.id} then #{item.authType}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('authTypeIncrement')) or (colPickMode==1 and !item.containsKey('authTypeIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.authType,0) + #{item.authTypeIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="orderId=(case" suffix="ELSE orderId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('orderId')) or (colPickMode==1 and !item.containsKey('orderId'))">
-                                        when a.id=#{item.id} then #{item.orderId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('orderIdIncrement')) or (colPickMode==1 and !item.containsKey('orderIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.orderId,0) + #{item.orderIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
-                            when a.id=#{item.id} then #{item.createTime}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
-                                        when a.id=#{item.id} then #{item.createUserId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="createUserName=(case" suffix="ELSE createUserName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))">
-                            when a.id=#{item.id} then #{item.createUserName}
-                        </if>
-                    </foreach>
-                </trim>
+            <trim prefix="name=(case" suffix="ELSE name end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                        when a.id=#{item.id} then #{item.name}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="url=(case" suffix="ELSE url end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('url')) or (colPickMode==1 and !item.containsKey('url'))">
+                        when a.id=#{item.id} then #{item.url}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="parentId=(case" suffix="ELSE parentId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('parentId')) or (colPickMode==1 and !item.containsKey('parentId'))">
+                            when a.id=#{item.id} then #{item.parentId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('parentIdIncrement')) or (colPickMode==1 and !item.containsKey('parentIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.parentId,0) + #{item.parentIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="linkType=(case" suffix="ELSE linkType end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('linkType')) or (colPickMode==1 and !item.containsKey('linkType'))">
+                            when a.id=#{item.id} then #{item.linkType}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('linkTypeIncrement')) or (colPickMode==1 and !item.containsKey('linkTypeIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.linkType,0) + #{item.linkTypeIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="imgPath=(case" suffix="ELSE imgPath end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('imgPath')) or (colPickMode==1 and !item.containsKey('imgPath'))">
+                        when a.id=#{item.id} then #{item.imgPath}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="buttonImgPath=(case" suffix="ELSE buttonImgPath end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('buttonImgPath')) or (colPickMode==1 and !item.containsKey('buttonImgPath'))">
+                        when a.id=#{item.id} then #{item.buttonImgPath}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="imgCommPath=(case" suffix="ELSE imgCommPath end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('imgCommPath')) or (colPickMode==1 and !item.containsKey('imgCommPath'))">
+                        when a.id=#{item.id} then #{item.imgCommPath}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="visible=(case" suffix="ELSE visible end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('visible')) or (colPickMode==1 and !item.containsKey('visible'))">
+                            when a.id=#{item.id} then #{item.visible}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('visibleIncrement')) or (colPickMode==1 and !item.containsKey('visibleIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.visible,0) + #{item.visibleIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="menuType=(case" suffix="ELSE menuType end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('menuType')) or (colPickMode==1 and !item.containsKey('menuType'))">
+                            when a.id=#{item.id} then #{item.menuType}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('menuTypeIncrement')) or (colPickMode==1 and !item.containsKey('menuTypeIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.menuType,0) + #{item.menuTypeIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="status=(case" suffix="ELSE status end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
+                            when a.id=#{item.id} then #{item.status}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="authType=(case" suffix="ELSE authType end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('authType')) or (colPickMode==1 and !item.containsKey('authType'))">
+                            when a.id=#{item.id} then #{item.authType}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('authTypeIncrement')) or (colPickMode==1 and !item.containsKey('authTypeIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.authType,0) + #{item.authTypeIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="orderId=(case" suffix="ELSE orderId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('orderId')) or (colPickMode==1 and !item.containsKey('orderId'))">
+                            when a.id=#{item.id} then #{item.orderId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('orderIdIncrement')) or (colPickMode==1 and !item.containsKey('orderIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.orderId,0) + #{item.orderIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                        when a.id=#{item.id} then #{item.createTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                            when a.id=#{item.id} then #{item.createUserId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="createUserName=(case" suffix="ELSE createUserName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))">
+                        when a.id=#{item.id} then #{item.createUserName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="remark=(case" suffix="ELSE remark end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                        when a.id=#{item.id} then #{item.remark}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -429,393 +443,413 @@
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('id')">
-                <if test="conditionParamRef.id != null ">
-                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
-                </if>
-                <if test="conditionParamRef.id == null">
-                    ${_conditionType_} a.id is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('idList')">
-                ${_conditionType_} a.id in
-                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
-                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null ">
+                ${_conditionType_} a.id = #{${_conditionParam_}.id}
             </if>
-            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
-                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            <if test="conditionParamRef.id == null">
+                ${_conditionType_} a.id is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('idList')">
+            ${_conditionType_} a.id in
+            <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+            ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+        </if>
+        <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+            ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('name')">
-                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
-                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
-                </if>
-                <if test="conditionParamRef.name == null">
-                    ${_conditionType_} a.name is null
-                </if>
+        <if test="conditionParamRef.containsKey('name')">
+            <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                ${_conditionType_} a.name like #{${_conditionParam_}.name}
             </if>
-            <if test="conditionParamRef.containsKey('nameList')">
-                ${_conditionType_} a.name in
-                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.name == null">
+                ${_conditionType_} a.name is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('nameList')">
+            ${_conditionType_} a.name in
+            <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('url')">
-                <if test="conditionParamRef.url != null and conditionParamRef.url != ''">
-                    ${_conditionType_} a.url like #{${_conditionParam_}.url}
-                </if>
-                <if test="conditionParamRef.url == null">
-                    ${_conditionType_} a.url is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('urlList')">
-                ${_conditionType_} a.url in
-                <foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('url')">
+            <if test="conditionParamRef.url != null and conditionParamRef.url != ''">
+                ${_conditionType_} a.url like #{${_conditionParam_}.url}
             </if>
-            <if test="conditionParamRef.containsKey('parentId')">
-                <if test="conditionParamRef.parentId != null ">
-                    ${_conditionType_} a.parentId = #{${_conditionParam_}.parentId}
-                </if>
-                <if test="conditionParamRef.parentId == null">
-                    ${_conditionType_} a.parentId is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('parentIdList')">
-                ${_conditionType_} a.parentId in
-                <foreach collection="conditionParamRef.parentIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.url == null">
+                ${_conditionType_} a.url is null
             </if>
-            <if test="conditionParamRef.containsKey('parentIdStart') and conditionParamRef.parentIdStart != null">
-                ${_conditionType_} a.parentId <![CDATA[ >= ]]> #{${_conditionParam_}.parentIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('urlList')">
+            ${_conditionType_} a.url in
+            <foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('parentId')">
+            <if test="conditionParamRef.parentId != null ">
+                ${_conditionType_} a.parentId = #{${_conditionParam_}.parentId}
             </if>
-            <if test="conditionParamRef.containsKey('parentIdEnd') and conditionParamRef.parentIdEnd != null">
-                ${_conditionType_} a.parentId <![CDATA[ <= ]]> #{${_conditionParam_}.parentIdEnd}
+            <if test="conditionParamRef.parentId == null">
+                ${_conditionType_} a.parentId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('parentIdList')">
+            ${_conditionType_} a.parentId in
+            <foreach collection="conditionParamRef.parentIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('parentIdStart') and conditionParamRef.parentIdStart != null">
+            ${_conditionType_} a.parentId <![CDATA[ >= ]]> #{${_conditionParam_}.parentIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('parentIdEnd') and conditionParamRef.parentIdEnd != null">
+            ${_conditionType_} a.parentId <![CDATA[ <= ]]> #{${_conditionParam_}.parentIdEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('linkType')">
-                <if test="conditionParamRef.linkType != null ">
-                    ${_conditionType_} a.linkType = #{${_conditionParam_}.linkType}
-                </if>
-                <if test="conditionParamRef.linkType == null">
-                    ${_conditionType_} a.linkType is null
-                </if>
+        <if test="conditionParamRef.containsKey('linkType')">
+            <if test="conditionParamRef.linkType != null ">
+                ${_conditionType_} a.linkType = #{${_conditionParam_}.linkType}
             </if>
-            <if test="conditionParamRef.containsKey('linkTypeList')">
-                ${_conditionType_} a.linkType in
-                <foreach collection="conditionParamRef.linkTypeList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('linkTypeStart') and conditionParamRef.linkTypeStart != null">
-                ${_conditionType_} a.linkType <![CDATA[ >= ]]> #{${_conditionParam_}.linkTypeStart}
-            </if>
-            <if test="conditionParamRef.containsKey('linkTypeEnd') and conditionParamRef.linkTypeEnd != null">
-                ${_conditionType_} a.linkType <![CDATA[ <= ]]> #{${_conditionParam_}.linkTypeEnd}
+            <if test="conditionParamRef.linkType == null">
+                ${_conditionType_} a.linkType is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('linkTypeList')">
+            ${_conditionType_} a.linkType in
+            <foreach collection="conditionParamRef.linkTypeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('linkTypeStart') and conditionParamRef.linkTypeStart != null">
+            ${_conditionType_} a.linkType <![CDATA[ >= ]]> #{${_conditionParam_}.linkTypeStart}
+        </if>
+        <if test="conditionParamRef.containsKey('linkTypeEnd') and conditionParamRef.linkTypeEnd != null">
+            ${_conditionType_} a.linkType <![CDATA[ <= ]]> #{${_conditionParam_}.linkTypeEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('imgPath')">
-                <if test="conditionParamRef.imgPath != null and conditionParamRef.imgPath != ''">
-                    ${_conditionType_} a.imgPath like #{${_conditionParam_}.imgPath}
-                </if>
-                <if test="conditionParamRef.imgPath == null">
-                    ${_conditionType_} a.imgPath is null
-                </if>
+        <if test="conditionParamRef.containsKey('imgPath')">
+            <if test="conditionParamRef.imgPath != null and conditionParamRef.imgPath != ''">
+                ${_conditionType_} a.imgPath like #{${_conditionParam_}.imgPath}
             </if>
-            <if test="conditionParamRef.containsKey('imgPathList')">
-                ${_conditionType_} a.imgPath in
-                <foreach collection="conditionParamRef.imgPathList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.imgPath == null">
+                ${_conditionType_} a.imgPath is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('imgPathList')">
+            ${_conditionType_} a.imgPath in
+            <foreach collection="conditionParamRef.imgPathList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('buttonImgPath')">
-                <if test="conditionParamRef.buttonImgPath != null and conditionParamRef.buttonImgPath != ''">
-                    ${_conditionType_} a.buttonImgPath like #{${_conditionParam_}.buttonImgPath}
-                </if>
-                <if test="conditionParamRef.buttonImgPath == null">
-                    ${_conditionType_} a.buttonImgPath is null
-                </if>
+        <if test="conditionParamRef.containsKey('buttonImgPath')">
+            <if test="conditionParamRef.buttonImgPath != null and conditionParamRef.buttonImgPath != ''">
+                ${_conditionType_} a.buttonImgPath like #{${_conditionParam_}.buttonImgPath}
             </if>
-            <if test="conditionParamRef.containsKey('buttonImgPathList')">
-                ${_conditionType_} a.buttonImgPath in
-                <foreach collection="conditionParamRef.buttonImgPathList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.buttonImgPath == null">
+                ${_conditionType_} a.buttonImgPath is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('buttonImgPathList')">
+            ${_conditionType_} a.buttonImgPath in
+            <foreach collection="conditionParamRef.buttonImgPathList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('imgCommPath')">
-                <if test="conditionParamRef.imgCommPath != null and conditionParamRef.imgCommPath != ''">
-                    ${_conditionType_} a.imgCommPath like #{${_conditionParam_}.imgCommPath}
-                </if>
-                <if test="conditionParamRef.imgCommPath == null">
-                    ${_conditionType_} a.imgCommPath is null
-                </if>
+        <if test="conditionParamRef.containsKey('imgCommPath')">
+            <if test="conditionParamRef.imgCommPath != null and conditionParamRef.imgCommPath != ''">
+                ${_conditionType_} a.imgCommPath like #{${_conditionParam_}.imgCommPath}
             </if>
-            <if test="conditionParamRef.containsKey('imgCommPathList')">
-                ${_conditionType_} a.imgCommPath in
-                <foreach collection="conditionParamRef.imgCommPathList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.imgCommPath == null">
+                ${_conditionType_} a.imgCommPath is null
             </if>
-            <if test="conditionParamRef.containsKey('visible')">
-                <if test="conditionParamRef.visible != null ">
-                    ${_conditionType_} a.visible = #{${_conditionParam_}.visible}
-                </if>
-                <if test="conditionParamRef.visible == null">
-                    ${_conditionType_} a.visible is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('visibleList')">
-                ${_conditionType_} a.visible in
-                <foreach collection="conditionParamRef.visibleList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('visibleStart') and conditionParamRef.visibleStart != null">
-                ${_conditionType_} a.visible <![CDATA[ >= ]]> #{${_conditionParam_}.visibleStart}
+        </if>
+        <if test="conditionParamRef.containsKey('imgCommPathList')">
+            ${_conditionType_} a.imgCommPath in
+            <foreach collection="conditionParamRef.imgCommPathList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('visible')">
+            <if test="conditionParamRef.visible != null ">
+                ${_conditionType_} a.visible = #{${_conditionParam_}.visible}
             </if>
-            <if test="conditionParamRef.containsKey('visibleEnd') and conditionParamRef.visibleEnd != null">
-                ${_conditionType_} a.visible <![CDATA[ <= ]]> #{${_conditionParam_}.visibleEnd}
+            <if test="conditionParamRef.visible == null">
+                ${_conditionType_} a.visible is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('visibleList')">
+            ${_conditionType_} a.visible in
+            <foreach collection="conditionParamRef.visibleList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('visibleStart') and conditionParamRef.visibleStart != null">
+            ${_conditionType_} a.visible <![CDATA[ >= ]]> #{${_conditionParam_}.visibleStart}
+        </if>
+        <if test="conditionParamRef.containsKey('visibleEnd') and conditionParamRef.visibleEnd != null">
+            ${_conditionType_} a.visible <![CDATA[ <= ]]> #{${_conditionParam_}.visibleEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('menuType')">
-                <if test="conditionParamRef.menuType != null ">
-                    ${_conditionType_} a.menuType = #{${_conditionParam_}.menuType}
-                </if>
-                <if test="conditionParamRef.menuType == null">
-                    ${_conditionType_} a.menuType is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('menuTypeList')">
-                ${_conditionType_} a.menuType in
-                <foreach collection="conditionParamRef.menuTypeList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        <if test="conditionParamRef.containsKey('menuType')">
+            <if test="conditionParamRef.menuType != null ">
+                ${_conditionType_} a.menuType = #{${_conditionParam_}.menuType}
             </if>
-            <if test="conditionParamRef.containsKey('menuTypeStart') and conditionParamRef.menuTypeStart != null">
-                ${_conditionType_} a.menuType <![CDATA[ >= ]]> #{${_conditionParam_}.menuTypeStart}
-            </if>
-            <if test="conditionParamRef.containsKey('menuTypeEnd') and conditionParamRef.menuTypeEnd != null">
-                ${_conditionType_} a.menuType <![CDATA[ <= ]]> #{${_conditionParam_}.menuTypeEnd}
+            <if test="conditionParamRef.menuType == null">
+                ${_conditionType_} a.menuType is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('menuTypeList')">
+            ${_conditionType_} a.menuType in
+            <foreach collection="conditionParamRef.menuTypeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('menuTypeStart') and conditionParamRef.menuTypeStart != null">
+            ${_conditionType_} a.menuType <![CDATA[ >= ]]> #{${_conditionParam_}.menuTypeStart}
+        </if>
+        <if test="conditionParamRef.containsKey('menuTypeEnd') and conditionParamRef.menuTypeEnd != null">
+            ${_conditionType_} a.menuType <![CDATA[ <= ]]> #{${_conditionParam_}.menuTypeEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('status')">
-                <if test="conditionParamRef.status != null ">
-                    ${_conditionType_} a.status = #{${_conditionParam_}.status}
-                </if>
-                <if test="conditionParamRef.status == null">
-                    ${_conditionType_} a.status is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('statusList')">
-                ${_conditionType_} a.status in
-                <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
-                ${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
+        <if test="conditionParamRef.containsKey('status')">
+            <if test="conditionParamRef.status != null ">
+                ${_conditionType_} a.status = #{${_conditionParam_}.status}
             </if>
-            <if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
-                ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
+            <if test="conditionParamRef.status == null">
+                ${_conditionType_} a.status is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('statusList')">
+            ${_conditionType_} a.status in
+            <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
+            ${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
+        </if>
+        <if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
+            ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('authType')">
-                <if test="conditionParamRef.authType != null ">
-                    ${_conditionType_} a.authType = #{${_conditionParam_}.authType}
-                </if>
-                <if test="conditionParamRef.authType == null">
-                    ${_conditionType_} a.authType is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('authTypeList')">
-                ${_conditionType_} a.authType in
-                <foreach collection="conditionParamRef.authTypeList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('authTypeStart') and conditionParamRef.authTypeStart != null">
-                ${_conditionType_} a.authType <![CDATA[ >= ]]> #{${_conditionParam_}.authTypeStart}
+        <if test="conditionParamRef.containsKey('authType')">
+            <if test="conditionParamRef.authType != null ">
+                ${_conditionType_} a.authType = #{${_conditionParam_}.authType}
             </if>
-            <if test="conditionParamRef.containsKey('authTypeEnd') and conditionParamRef.authTypeEnd != null">
-                ${_conditionType_} a.authType <![CDATA[ <= ]]> #{${_conditionParam_}.authTypeEnd}
+            <if test="conditionParamRef.authType == null">
+                ${_conditionType_} a.authType is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('authTypeList')">
+            ${_conditionType_} a.authType in
+            <foreach collection="conditionParamRef.authTypeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('authTypeStart') and conditionParamRef.authTypeStart != null">
+            ${_conditionType_} a.authType <![CDATA[ >= ]]> #{${_conditionParam_}.authTypeStart}
+        </if>
+        <if test="conditionParamRef.containsKey('authTypeEnd') and conditionParamRef.authTypeEnd != null">
+            ${_conditionType_} a.authType <![CDATA[ <= ]]> #{${_conditionParam_}.authTypeEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('orderId')">
-                <if test="conditionParamRef.orderId != null ">
-                    ${_conditionType_} a.orderId = #{${_conditionParam_}.orderId}
-                </if>
-                <if test="conditionParamRef.orderId == null">
-                    ${_conditionType_} a.orderId is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('orderIdList')">
-                ${_conditionType_} a.orderId in
-                <foreach collection="conditionParamRef.orderIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('orderIdStart') and conditionParamRef.orderIdStart != null">
-                ${_conditionType_} a.orderId <![CDATA[ >= ]]> #{${_conditionParam_}.orderIdStart}
+        <if test="conditionParamRef.containsKey('orderId')">
+            <if test="conditionParamRef.orderId != null ">
+                ${_conditionType_} a.orderId = #{${_conditionParam_}.orderId}
             </if>
-            <if test="conditionParamRef.containsKey('orderIdEnd') and conditionParamRef.orderIdEnd != null">
-                ${_conditionType_} a.orderId <![CDATA[ <= ]]> #{${_conditionParam_}.orderIdEnd}
+            <if test="conditionParamRef.orderId == null">
+                ${_conditionType_} a.orderId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('orderIdList')">
+            ${_conditionType_} a.orderId in
+            <foreach collection="conditionParamRef.orderIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('orderIdStart') and conditionParamRef.orderIdStart != null">
+            ${_conditionType_} a.orderId <![CDATA[ >= ]]> #{${_conditionParam_}.orderIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('orderIdEnd') and conditionParamRef.orderIdEnd != null">
+            ${_conditionType_} a.orderId <![CDATA[ <= ]]> #{${_conditionParam_}.orderIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('createTime')">
-                <if test="conditionParamRef.createTime != null ">
-                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
-                </if>
-                <if test="conditionParamRef.createTime == null">
-                    ${_conditionType_} a.createTime is null
-                </if>
+        <if test="conditionParamRef.containsKey('createTime')">
+            <if test="conditionParamRef.createTime != null ">
+                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
             </if>
-            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
-                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.createTime == null">
+                ${_conditionType_} a.createTime is null
             </if>
-            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
-                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+            ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+            ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('createUserId')">
+            <if test="conditionParamRef.createUserId != null ">
+                ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
             </if>
-            <if test="conditionParamRef.containsKey('createUserId')">
-                <if test="conditionParamRef.createUserId != null ">
-                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
-                </if>
-                <if test="conditionParamRef.createUserId == null">
-                    ${_conditionType_} a.createUserId is null
-                </if>
+            <if test="conditionParamRef.createUserId == null">
+                ${_conditionType_} a.createUserId is null
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdList')">
-                ${_conditionType_} a.createUserId in
-                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
-                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdList')">
+            ${_conditionType_} a.createUserId in
+            <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+            ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+            ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('createUserName')">
+            <if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''">
+                ${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName}
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
-                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            <if test="conditionParamRef.createUserName == null">
+                ${_conditionType_} a.createUserName is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserNameList')">
+            ${_conditionType_} a.createUserName in
+            <foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-
-            <if test="conditionParamRef.containsKey('createUserName')">
-                <if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''">
-                    ${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName}
-                </if>
-                <if test="conditionParamRef.createUserName == null">
-                    ${_conditionType_} a.createUserName is null
-                </if>
+        <if test="conditionParamRef.containsKey('remark')">
+            <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
             </if>
-            <if test="conditionParamRef.containsKey('createUserNameList')">
-                ${_conditionType_} a.createUserName in
-                <foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.remark == null">
+                ${_conditionType_} a.remark is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('remarkList')">
+            ${_conditionType_} a.remark in
+            <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     ${item.colName} ${item.sortKind}
+                    ${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
-                    <if test="orderCol.containsKey('id')">
-                        a.id
-                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('name')">
-                        a.name
-                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('url')">
-                        a.url
-                        <if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('parentId')">
-                        a.parentId
-                        <if test='orderCol.parentId != null and "DESC".equalsIgnoreCase(orderCol.parentId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('linkType')">
-                        a.linkType
-                        <if test='orderCol.linkType != null and "DESC".equalsIgnoreCase(orderCol.linkType)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('imgPath')">
-                        a.imgPath
-                        <if test='orderCol.imgPath != null and "DESC".equalsIgnoreCase(orderCol.imgPath)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('buttonImgPath')">
-                        a.buttonImgPath
-                        <if test='orderCol.buttonImgPath != null and "DESC".equalsIgnoreCase(orderCol.buttonImgPath)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('imgCommPath')">
-                        a.imgCommPath
-                        <if test='orderCol.imgCommPath != null and "DESC".equalsIgnoreCase(orderCol.imgCommPath)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('visible')">
-                        a.visible
-                        <if test='orderCol.visible != null and "DESC".equalsIgnoreCase(orderCol.visible)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('menuType')">
-                        a.menuType
-                        <if test='orderCol.menuType != null and "DESC".equalsIgnoreCase(orderCol.menuType)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('status')">
-                        a.status
-                        <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('authType')">
-                        a.authType
-                        <if test='orderCol.authType != null and "DESC".equalsIgnoreCase(orderCol.authType)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('orderId')">
-                        a.orderId
-                        <if test='orderCol.orderId != null and "DESC".equalsIgnoreCase(orderCol.orderId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createTime')">
-                        a.createTime
-                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createUserId')">
-                        a.createUserId
-                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createUserName')">
-                        a.createUserName
-                        <if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if>
-                        ,
-                    </if>
+                <if test="orderCol.containsKey('id')">
+                    a.id
+                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('name')">
+                    a.name
+                    <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('url')">
+                    a.url
+                    <if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('parentId')">
+                    a.parentId
+                    <if test='orderCol.parentId != null and "DESC".equalsIgnoreCase(orderCol.parentId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('linkType')">
+                    a.linkType
+                    <if test='orderCol.linkType != null and "DESC".equalsIgnoreCase(orderCol.linkType)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('imgPath')">
+                    a.imgPath
+                    <if test='orderCol.imgPath != null and "DESC".equalsIgnoreCase(orderCol.imgPath)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('buttonImgPath')">
+                    a.buttonImgPath
+                    <if test='orderCol.buttonImgPath != null and "DESC".equalsIgnoreCase(orderCol.buttonImgPath)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('imgCommPath')">
+                    a.imgCommPath
+                    <if test='orderCol.imgCommPath != null and "DESC".equalsIgnoreCase(orderCol.imgCommPath)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('visible')">
+                    a.visible
+                    <if test='orderCol.visible != null and "DESC".equalsIgnoreCase(orderCol.visible)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('menuType')">
+                    a.menuType
+                    <if test='orderCol.menuType != null and "DESC".equalsIgnoreCase(orderCol.menuType)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('status')">
+                    a.status
+                    <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('authType')">
+                    a.authType
+                    <if test='orderCol.authType != null and "DESC".equalsIgnoreCase(orderCol.authType)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('orderId')">
+                    a.orderId
+                    <if test='orderCol.orderId != null and "DESC".equalsIgnoreCase(orderCol.orderId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createTime')">
+                    a.createTime
+                    <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createUserId')">
+                    a.createUserId
+                    <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createUserName')">
+                    a.createUserName
+                    <if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('remark')">
+                    a.remark
+                    <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>
-- 
2.24.3