Merge remote-tracking branch 'origin/20210223' into 20210223

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

@@ -9,9 +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="englishName" column="ENGLISH_NAME"/>
         <result property="menuImage" column="menu_image"/>
-        <result property="menuDynamicImage" column="MENU_DYNAMICIMAGE"/>
+        <result property="menuDynamicImage" column="MENU_DYNAMIC_IMAGE"/>
         <result property="permissionFlag" column="permission_flag"/>
         <result property="linkPath" column="link_path"/>
         <result property="seq" column="seq"/>
@@ -32,8 +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.ENGLISH_NAME as "englishName",
+         a.MENU_DYNAMIC_IMAGE as "menuDynamicImage",
          a.menu_image as "menuImage" ,
          a.permission_flag as "permissionFlag" ,
          a.link_path as "linkPath" ,
@@ -110,8 +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.ENGLISH_NAME as "englishName",
+        a.MENU_DYNAMIC_IMAGE as "menuDynamicImage",
         a.menu_image as "menuImage" ,
         b.permission_flag as "permissionFlag" ,
         a.link_path as "linkPath" ,
@@ -148,8 +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",
+        a.ENGLISH_NAME as "englishName",
+        a.MENU_DYNAMIC_IMAGE as "menuDynamicImage",
         b.permission_flag as "permissionFlag" ,
         a.link_path as "linkPath" ,
         a.MENU_SEQ as "seq" ,
@@ -180,8 +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.ENGLISH_NAME as "englishName",
+        a.MENU_DYNAMIC_IMAGE as "menuDynamicImage",
         a.menu_image as "menuImage" ,
         b.permission_flag as "permissionFlag" ,
         a.link_path as "linkPath" ,
@@ -219,8 +219,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.ENGLISH_NAME as "englishName",
+        a.MENU_DYNAMIC_IMAGE as "menuDynamicImage",
         a.menu_image as "menuImage" ,
         a.permission_flag as "permissionFlag" ,
         a.link_path as "linkPath" ,
@@ -260,8 +260,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",
+        b.ENGLISH_NAME as "englishName",
+        b.MENU_DYNAMIC_IMAGE as "menuDynamicImage",
         a.permission_flag as "permissionFlag" ,
         b.LINK_PATH as "linkPath" ,
         b.MENU_SEQ as "seq" ,
@@ -289,8 +289,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",
+        b.ENGLISH_NAME as "englishName",
+        b.MENU_DYNAMIC_IMAGE as "menuDynamicImage",
         a.permission_flag as "permissionFlag" ,
         b.LINK_PATH as "linkPath" ,
         b.MENU_SEQ as "seq" ,
@@ -337,8 +337,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",
+        b.ENGLISH_NAME as "englishName",
+        b.MENU_DYNAMIC_IMAGE as "menuDynamicImage",
         a.permission_flag as "permissionFlag" ,
         b.LINK_PATH as "linkPath" ,
         b.MENU_SEQ as "seq" ,
@@ -369,8 +369,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",
+        b.ENGLISH_NAME as "englishName",
+        b.MENU_DYNAMIC_IMAGE as "menuDynamicImage",
         a.permission_flag as "permissionFlag" ,
         b.LINK_PATH as "linkPath" ,
         b.MENU_SEQ as "seq" ,