From d3abd6c96e99e32ccfc030230e06ce4b529f2bbd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 17 八月 2021 10:38:07 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into 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