Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-25 6e1a8ef6edb2bca8107da557e735c40c10494dda

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

@@ -714,14 +714,14 @@
     * @return
     */
    @PostMapping("/upload")
    public String upload(MultipartFile file){
    public R<String> upload(MultipartFile file){
        String s = null;
        try {
            s = ObsUploadUtil.obsUpload(file);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
        return s;
        return R.ok(s);
    }
}