From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
index 69bab49..64ac8ef 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
+++ b/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);
     }
 
     /**

--
Gitblit v1.9.3