Merge remote-tracking branch 'origin/master' into test

authorize-api-service/src/main/java/com/xy/service/impl/SysMenuServiceImpl.java

@@ -120,16 +120,16 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                     ? RedisCache.getMenu(sysId, workMenu.getClientType())
                     : RedisCache.getMenu(sysId);
             menus.forEach(sysMenuJoinSysRoleMenu -> list.add(copy(SysMenuDto.Vo.class, sysMenuJoinSysRoleMenu)));
-            if ("en".equals(lang)) {
-                //英文菜单
-                list.forEach(sm -> {
-                    String enName = sm.getEnName();
-                    if (StrUtil.isNotEmpty(enName)) {
-                        sm.setName(enName);
-                    }
-                });
-
-            }
+//            if ("en".equals(lang)) {
+//                //英文菜单
+//                list.forEach(sm -> {
+//                    String enName = sm.getEnName();
+//                    if (StrUtil.isNotEmpty(enName)) {
+//                        sm.setName(enName);
+//                    }
+//                });
+//
+//            }
             SysSystem sysSystem = sysSystemJMap.get(sysId);
             if (sysSystem == null) {
                 continue;
@@ -140,10 +140,10 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                     .setName(sysSystem.getName())
                     .setIcon(sysSystem.getIcon())
                     .setMenu(list);
-            if ("en".equals(lang) && "xy_merc_mini".equals(sysSystem.getCode())) {
-                //商管端
-                menuVo.setName("Business Management Platform");
-            }
+//            if ("en".equals(lang) && "xy_merc_mini".equals(sysSystem.getCode())) {
+//                //商管端
+//                menuVo.setName("Business Management Platform");
+//            }
             menuVos.add(menuVo);
         }
         return R.ok(menuVos);