Merge remote-tracking branch 'origin/dev_PersonChange_20230712'

# Conflicts:
#	jero-web/src/views/projectManagement/components/listEditModel.vue

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/StringUtils.java

@@ -5,6 +5,7 @@ import org.apache.commons.collections.CollectionUtils;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author: liyawei
@@ -129,5 +130,18 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
             return String.valueOf(param);
         }
     }
+
+    /**
+     * 字符串去重
+     * @param values
+     * @return
+     */
+    public static String strDistinct(String values){
+        String result = "";
+        if (StringUtils.isNotEmpty(values)) {
+            result = Arrays.asList(values.split(",")).stream().distinct().collect(Collectors.joining(","));
+        }
+        return result;
+    }
 }