From e6294707131b0c4dd7304713d8f59f91658394dd Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 23:09:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
index 0bbf7d2..5a255a0 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
@@ -8,11 +8,14 @@
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.domain.MarrySelf;
import com.ruoyi.domain.MarryUser;
+import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.dto.MarryInfoDto;
import com.ruoyi.domain.dto.MarryUserDto;
import com.ruoyi.mapper.MarrySelfMapper;
import com.ruoyi.service.MarrySelfService;
import com.ruoyi.service.MarryUserService;
+import com.ruoyi.service.ZInfoUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -31,8 +34,12 @@
@Resource
MarryUserService marryUserService;
+
+
// @Resource
// MarrySelfService marrySelfService;
+
+
@Override
public AjaxResult getInfo() {
@@ -93,6 +100,9 @@
updateById(marrySelf);
}
+
+
+
return AjaxResult.success();
}
}
--
Gitblit v1.9.1