Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-09-06 ab4b75fe30f9a3cf08e3ced667c3ec8c711ca939

 ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java

@@ -110,7 +110,7 @@
                }
            }
        }
        return StringUtils.strip(propertyString.toString(), null, separator);
        return StringUtils.stripEnd(propertyString.toString(), separator);
    }

    /**
@@ -150,7 +150,7 @@
                }
            }
        }
        return StringUtils.strip(propertyString.toString(), null, separator);
        return StringUtils.stripEnd(propertyString.toString(), separator);
    }

    /**