Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-23 8d99c68a91484026ab86f837aaa25cbb4b19911e

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java

@@ -71,8 +71,8 @@
    /**
     * 上传文件存储在本地的根路径
     */
    @Value("${file.upload.location}")
    private String localFilePath;
//    @Value("${file.upload.location}")
//    private String localFilePath;