fix order字段

netflix-dao/src/main/java/com/cyksj/model/entity/CmsMenu.java

@@ -27,7 +27,7 @@ public class CmsMenu extends BaseEntity{
 
 	private String path;
 
-	private Integer order;
+	private Integer orderBy;
 
 	private Long parentId;
 }

netflix-dao/src/main/resources/mapper/CmsMenuMapper.xml

@@ -33,7 +33,7 @@
     <select id="getALlMenu" resultType="com.cyksj.model.views.CmsMenuVO">
         select *
         from `cms_menu`
-        order by `order`
+        order by `order_by`
     </select>
 
     <select id="getCmsMenusList" resultType="com.cyksj.model.views.CmsMenuVO">
@@ -48,7 +48,7 @@
                update_time,
                parent_id
         from `cms_menu`
-        where `type` != 'button' and parent_id = 0 order by `order`
+        where `type` != 'button' and parent_id = 0 order by `order_by`
     </select>
 
     <select id="getSelfCmsMenusList" resultType="com.cyksj.model.views.CmsMenuVO">
@@ -67,7 +67,7 @@
                             on crm.menu_id = cm.id
                  inner join `cms_user_role` cur on cur.role_id = crm.role_id
                  inner join `cms_user` cu on cu.id = cur.user_id
-        where cu.id = #{adminId} and cm.type != 'button' order by `order`
+        where cu.id = #{adminId} and cm.type != 'button' order by `order_by`
     </select>
 
     <select id="getCmsMenusByAccount" resultType="com.cyksj.model.entity.CmsMenu">