Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/resources/mapper/MenuMapper.xml

@@ -13,11 +13,14 @@
         <result column="parent_id" property="parentId" />
         <result column="is_button" property="isButton" />
         <result column="level" property="level" />
+        <result column="icon" property="icon" />
+        <result column="color" property="color" />
+        <result column="avatar" property="avatar" />
     </resultMap>
 
     <select id="getUserMenuPerms" resultMap="BaseResultMap">
         SELECT distinct
-            m.id,m.name,m.url,m.parent_id,m.sort,m.is_button,m.level
+            m.id,m.name,m.url,m.parent_id,m.sort,m.is_button,m.level,m.icon,m.color,m.avatar
         FROM
             ref_role_menu rm
         LEFT JOIN menu m ON m.id = rm.menu_id
@@ -30,7 +33,7 @@
             </foreach>
             </if>
         </where>
-        ORDER BY m.level desc
+        ORDER BY m.level desc,m.sort
     </select>
 
 </mapper>