Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

 zhang-content/src/main/java/com/ruoyi/service/MarrySelfService.java

@@ -14,5 +14,5 @@
public interface MarrySelfService extends IService<MarrySelf> {
    AjaxResult getInfo();

    AjaxResult updateData(MarryInfoDto marryInfoDto);
    Boolean updateData(MarryInfoDto marryInfoDto);
}