'commit'

10 months ago · ea2b39554a
parent 52ed51093e 5b0cb5da71
commit ea2b39554a
2 changed files with 6 additions and 1 deletions
--- a/dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java
+++ b/dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java
@ -336,8 +336,13 @@ public class MenuModel {
    @Getter
    @Setter
    public static class Meta {
+<<<<<<< HEAD
        private String icon;
        private String big_icon;
+=======
+        private String big_icon;
+        private String small_icon;
+>>>>>>> 5b0cb5da71c451cb655ca659f388fd07a0e53bf5
        private String title;
        private String isLink;
        private boolean isHide;
--- a/dsBase/src/main/resource/Sql/menu.sql
+++ b/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