Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

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

@@ -81,7 +81,7 @@
            System.out.println("报错"+e.getMessage());
            return AjaxResult.error("更新失败");
        }
        return marrySelfService.updateData(marryInfoDto);
        return AjaxResult.success( marrySelfService.updateData(marryInfoDto));
    }

    //导出