diff --git a/src/main/java/com/gxwebsoft/cms/entity/MpMenu.java b/src/main/java/com/gxwebsoft/cms/entity/MpMenu.java
index 252f982..7077d65 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/MpMenu.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/MpMenu.java
@@ -1,5 +1,6 @@
 package com.gxwebsoft.cms.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -116,4 +117,7 @@ public class MpMenu implements Serializable {
     @ApiModelProperty(value = "注册时间")
     private Date createTime;
 
+    @ApiModelProperty(value = "分组名称")
+    private String groupName;
+
 }
diff --git a/src/main/java/com/gxwebsoft/cms/entity/MpPages.java b/src/main/java/com/gxwebsoft/cms/entity/MpPages.java
index 41d085a..eab6153 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/MpPages.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/MpPages.java
@@ -43,6 +43,9 @@ public class MpPages implements Serializable {
     @ApiModelProperty(value = "分包")
     private String subpackage;
 
+    @ApiModelProperty(value = "图标")
+    private String icon;
+
     @ApiModelProperty(value = "排序(数字越小越靠前)")
     private Integer sortNumber;
 
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/MpPagesMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/MpPagesMapper.xml
index bd52ae4..30944da 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/xml/MpPagesMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/MpPagesMapper.xml
@@ -2,68 +2,70 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gxwebsoft.cms.mapper.MpPagesMapper">
 
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM cms_mp_pages a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.parentId != null">
-                AND a.parent_id = #{param.parentId}
-            </if>
-            <if test="param.title != null">
-                AND a.title LIKE CONCAT('%', #{param.title}, '%')
-            </if>
-            <if test="param.path != null">
-                AND a.path LIKE CONCAT('%', #{param.path}, '%')
-            </if>
-            <if test="param.home != null">
-                AND a.home = #{param.home}
-            </if>
-            <if test="param.subpackage != null">
-                AND a.subpackage LIKE CONCAT('%', #{param.subpackage}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-                AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
-                )
-              </if>
-        </where>
-    </sql>
+  <!-- 关联查询sql -->
+  <sql id="selectSql">
+    SELECT a.*
+    FROM cms_mp_pages a
+    <where>
+      <if test="param.id != null">
+        AND a.id = #{param.id}
+      </if>
+      <if test="param.parentId != null">
+        AND a.parent_id = #{param.parentId}
+      </if>
+      <if test="param.title != null">
+        AND a.title LIKE CONCAT('%', #{param.title}, '%')
+      </if>
+      <if test="param.path != null">
+        AND a.path LIKE CONCAT('%', #{param.path}, '%')
+      </if>
+      <if test="param.home != null">
+        AND a.home = #{param.home}
+      </if>
+      <if test="param.subpackage != null">
+        AND a.subpackage LIKE CONCAT('%', #{param.subpackage}, '%')
+      </if>
+      <if test="param.sortNumber != null">
+        AND a.sort_number = #{param.sortNumber}
+      </if>
+      <if test="param.comments != null">
+        AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
+      </if>
+      <if test="param.userId != null">
+        AND a.user_id = #{param.userId}
+      </if>
+      <if test="param.status != null">
+        AND a.status = #{param.status}
+      </if>
+      <if test="param.deleted != null">
+        AND a.deleted = #{param.deleted}
+      </if>
+      <if test="param.deleted == null">
+        AND a.deleted = 0
+      </if>
+      <if test="param.createTimeStart != null">
+        AND a.create_time &gt;= #{param.createTimeStart}
+      </if>
+      <if test="param.createTimeEnd != null">
+        AND a.create_time &lt;= #{param.createTimeEnd}
+      </if>
+      <if test="param.keywords != null">
+        AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
+        OR a.title LIKE CONCAT('%', #{param.keywords}, '%')
+        OR a.path LIKE CONCAT('%', #{param.keywords}, '%')
+        )
+      </if>
+    </where>
+  </sql>
 
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.cms.entity.MpPages">
-        <include refid="selectSql"></include>
-    </select>
+  <!-- 分页查询 -->
+  <select id="selectPageRel" resultType="com.gxwebsoft.cms.entity.MpPages">
+    <include refid="selectSql"></include>
+  </select>
 
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.cms.entity.MpPages">
-        <include refid="selectSql"></include>
-    </select>
+  <!-- 查询全部 -->
+  <select id="selectListRel" resultType="com.gxwebsoft.cms.entity.MpPages">
+    <include refid="selectSql"></include>
+  </select>
 
 </mapper>