菜单修改增加英文名称和动态图标

user_center/src/main/java/com/huaxu/entity/MenuEntity.java

@@ -48,10 +48,17 @@ public class MenuEntity {
     @ApiModelProperty(value = "名称")
     private String name;
 
+    @ApiModelProperty(value = "英文名称")
+    private String englishName;
+
     /** 图标 */
     @ApiModelProperty(value = "图标")
     private String menuImage;
 
+    /** 图标 */
+    @ApiModelProperty(value = "动态图标")
+    private String menuDynamicImage;
+
     /** 权限标识 */
     @ApiModelProperty(value = "权限标识")
     private String permissionFlag;

user_center/src/main/java/com/huaxu/entity/TenantMenuEntity.java

@@ -41,10 +41,17 @@ public class TenantMenuEntity {
     @ApiModelProperty(value = "名称")
     private String menuName;
 
+    @ApiModelProperty(value = "英文名称")
+    private String englishName;
+
     /** 图标 */
     @ApiModelProperty(value = "图标")
     private String menuImage;
 
+    /** 图标 */
+    @ApiModelProperty(value = "动态图标")
+    private String menuDynamicImage;
+
     /** 序列 */
     @ApiModelProperty(value = "序列")
     private Long menuSeq;

user_center/src/main/java/com/huaxu/service/MenuService.java

@@ -229,6 +229,8 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 			tenantMenuEntity.setUpdateBy(currentUser.getUsername());
 			tenantMenuEntity.setLinkPath(menu.getLinkPath());
 			tenantMenuEntity.setMenuImage(menu.getMenuImage());
+			tenantMenuEntity.setEnglishName(menu.getEnglishName());
+			tenantMenuEntity.setMenuDynamicImage(menu.getMenuDynamicImage());
 			tenantMenuEntity.setMenuName(menu.getName());
 			tenantMenuEntity.setMenuSeq(menu.getSeq());
 			tenantMenuEntity.setRemark(menu.getRemark());

user_center/src/main/resources/mapper/MenuMapper.xml

@@ -9,7 +9,9 @@
         <result property="thirdMenuId" column="third_menu_id"/>
         <result property="parentMenuId" column="parent_menu_id"/>
         <result property="name" column="name"/>
+        <result property="englishName" column="ENGLISHNAME"/>
         <result property="menuImage" column="menu_image"/>
+        <result property="menuDynamicImage" column="MENU_DYNAMICIMAGE"/>
         <result property="permissionFlag" column="permission_flag"/>
         <result property="linkPath" column="link_path"/>
         <result property="seq" column="seq"/>
@@ -30,6 +32,8 @@
          a.third_menu_id as "thirdMenuId" ,
          a.parent_menu_id as "parentMenuId" ,
          a.name as "name" ,
+         a.ENGLISHNAME as "englishName",
+         a.MENU_DYNAMICIMAGE as "menuDynamicImage",
          a.menu_image as "menuImage" ,
          a.permission_flag as "permissionFlag" ,
          a.link_path as "linkPath" ,
@@ -106,6 +110,8 @@
         b.parent_menu_id as "parentMenuId" ,
         a.id as "tenantMenuId",
         a.MENU_NAME as "name" ,
+        a.ENGLISHNAME as "englishName",
+        a.MENU_DYNAMICIMAGE as "menuDynamicImage",
         a.menu_image as "menuImage" ,
         b.permission_flag as "permissionFlag" ,
         a.link_path as "linkPath" ,
@@ -142,6 +148,8 @@
         a.id as "tenantMenuId",
         a.MENU_NAME as "name" ,
         a.menu_image as "menuImage" ,
+        a.ENGLISHNAME as "englishName",
+        a.MENU_DYNAMICIMAGE as "menuDynamicImage",
         b.permission_flag as "permissionFlag" ,
         a.link_path as "linkPath" ,
         a.MENU_SEQ as "seq" ,
@@ -172,6 +180,8 @@
         b.parent_menu_id as "parentMenuId" ,
         a.id as "tenantMenuId",
         a.MENU_NAME as "name" ,
+        a.ENGLISHNAME as "englishName",
+        a.MENU_DYNAMICIMAGE as "menuDynamicImage",
         a.menu_image as "menuImage" ,
         b.permission_flag as "permissionFlag" ,
         a.link_path as "linkPath" ,
@@ -230,6 +240,8 @@
         a.parent_menu_id as "parentMenuId" ,
         b.MENU_NAME as "name" ,
         b.MENU_IMAGE as "menuImage" ,
+        b.ENGLISHNAME as "englishName",
+        b.MENU_DYNAMICIMAGE as "menuDynamicImage",
         a.permission_flag as "permissionFlag" ,
         b.LINK_PATH as "linkPath" ,
         b.MENU_SEQ as "seq" ,
@@ -257,6 +269,8 @@
         a.parent_menu_id as "parentMenuId" ,
         b.MENU_NAME as "name" ,
         b.MENU_IMAGE as "menuImage" ,
+        b.ENGLISHNAME as "englishName",
+        b.MENU_DYNAMICIMAGE as "menuDynamicImage",
         a.permission_flag as "permissionFlag" ,
         b.LINK_PATH as "linkPath" ,
         b.MENU_SEQ as "seq" ,
@@ -303,6 +317,8 @@
         a.parent_menu_id as "parentMenuId" ,
         b.MENU_NAME as "name" ,
         b.MENU_IMAGE as "menuImage" ,
+        b.ENGLISHNAME as "englishName",
+        b.MENU_DYNAMICIMAGE as "menuDynamicImage",
         a.permission_flag as "permissionFlag" ,
         b.LINK_PATH as "linkPath" ,
         b.MENU_SEQ as "seq" ,
@@ -333,6 +349,8 @@
         a.parent_menu_id as "parentMenuId" ,
         b.MENU_NAME as "name" ,
         b.MENU_IMAGE as "menuImage" ,
+        b.ENGLISHNAME as "englishName",
+        b.MENU_DYNAMICIMAGE as "menuDynamicImage",
         a.permission_flag as "permissionFlag" ,
         b.LINK_PATH as "linkPath" ,
         b.MENU_SEQ as "seq" ,