Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/qrCodeController.java

@@ -152,8 +152,8 @@
            String fileName = FileUploadUtils.upload(multipartFile,fname);
            url = serverConfig.getUrl() + fname;
            System.out.println(url);
            System.out.println(fileName);
            System.out.println(FileUtils.getName(fileName));
      //      System.out.println(fileName);
       //     System.out.println(FileUtils.getName(fileName));
            qrcode cos = new qrcode();
            cos.setId(id);
            cos.setCodeS(fname);