'commit'

dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java

@@ -336,7 +336,8 @@ public class MenuModel {
     @Getter
     @Setter
     public static class Meta {
-        private String icon;
+        private String big_icon;
+        private String small_icon;
         private String title;
         private String isLink;
         private boolean isHide;
@@ -369,7 +370,8 @@ public class MenuModel {
             sMenu.setComponent(url);
 
             Meta meta = new Meta();
-            meta.setIcon(rs.getStr("icon"));
+            meta.setSmall_icon(rs.getStr("small_icon"));
+            meta.setBig_icon(rs.getStr("big_icon"));
             meta.setTitle(rs.getStr("menu_name"));
             meta.setIsLink("");
             meta.setHide(false);

dsBase/src/main/resource/Sql/menu.sql

@@ -36,7 +36,7 @@ select identity_id from t_base_menu_privilage where menu_id=?
   #sql("selectSingle")
     select t1.menu_id,t1.menu_name,t1.parent_id,t1.sort_id,t1.url,t1.memo,
            t1.create_time,t1.update_ts,t1.level_id,t1.for_school,t1.for_bureau,
-           t1.icon,t1.isFull,
+           t1.big_icon,t1.small_icon,t1.isFull,
        (select count(1) from t_base_menu as t2 where t1.menu_id=t2.parent_id) as is_leaf
     from t_base_menu as t1 where t1.menu_id=?
   #end