Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

 ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java

@@ -25,7 +25,7 @@
//        InputStream is = new FileInputStream(new File("D:\\test.xlsx"));
//        ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
//        List<ZfProperty> userList = util.importExcel(is);
        String originalString="张若双"+"-13602730899";
        String originalString="钟山"+"-13808810489";

        String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();