From 622b92bac0fe45067bcaab3358168561b0dfbadb Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 27 三月 2024 11:21:48 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/UnionApplyService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/UnionApplyService.java b/server/service/src/main/java/com/doumee/service/business/UnionApplyService.java
index d62db04..6e36ad7 100644
--- a/server/service/src/main/java/com/doumee/service/business/UnionApplyService.java
+++ b/server/service/src/main/java/com/doumee/service/business/UnionApplyService.java
@@ -102,7 +102,7 @@
      * 淇濆崟鍚堝苟
      * @param saveUnionApplyDTO
      */
-    void merge(SaveUnionApplyDTO saveUnionApplyDTO);
+    Integer merge(SaveUnionApplyDTO saveUnionApplyDTO);
 
     /**
      * 鍙栨秷鍚堝苟鍗�

--
Gitblit v1.9.3