From dc3cfa57c400ded43fdac3a73c7be27a18a90b23 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 28 三月 2024 15:57:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 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