Merge branch 'developerB' of http://git.caimei365.com/caimei365/caimei365-www into developerB

src/main/java/com/caimei/www/pojo/page/TopMenu.java

@@ -21,7 +21,12 @@ public class TopMenu implements Serializable {
 	private String type;
 	/** 一级导航链接 */
 	private String link;
-    /**
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	/**
      * 图标
      */
     private String icon;

src/main/resources/mapper/BaseMapper.xml

@@ -14,6 +14,7 @@
             navigationName as name,
             type,
             link,
+            remark,
             icon,
             sort
 		from new_page_first_navigation