智慧粮库
parent: ea038a54 | patch | commit | ignore whitespace
RuoYi
2021-07-31 e57d2ea17c6259afecccbd9fea9439bf68714a5a 
升级nacos到最新版2.0.3
2 files modified
5 ■■■■■ changed files
pom.xml 2 ●●●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java 3 ●●●●● patch | view | raw | blame | history 
 pom.xml


@@ -20,7 +20,7 @@


        <spring-boot.version>2.5.3</spring-boot.version>



        <spring-cloud.version>2020.0.3</spring-cloud.version>



        <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>



        <alibaba.nacos.version>2.0.2</alibaba.nacos.version>



        <alibaba.nacos.version>2.0.3</alibaba.nacos.version>



        <spring-boot-admin.version>2.4.3</spring-boot-admin.version>



        <spring-boot.mybatis>2.2.0</spring-boot.mybatis>



        <swagger.fox.version>3.0.0</swagger.fox.version>





 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java


@@ -280,7 +280,8 @@


     */



    public static String getParentMenuId(JSONObject paramsObj)



    {



        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))



        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)



                && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID)))



        {



            return paramsObj.getString(GenConstants.PARENT_MENU_ID);



        }