From 72aaf45389cd09c206ee1b90f0c7f5bf59782930 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmBranchService.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmBranchService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmBranchService.java
index 38efae4..e499585 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmBranchService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmBranchService.java
@@ -4,10 +4,14 @@
 import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.dto.TCrmBranchDTO;
+import com.ruoyi.system.export.TCrmBranchExport;
 import com.ruoyi.system.model.TCrmBranch;
 import com.ruoyi.system.model.TCrmDevice;
 import com.ruoyi.system.query.TCrmBranchQuery;
+import com.ruoyi.system.query.TSysAppUserQuery;
 import com.ruoyi.system.vo.TCrmBranchVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -31,11 +35,25 @@
      * @param dto
      * @return
      */
-    R<Boolean> add(TCrmBranchDTO dto);
+    R<Boolean> addBranch(TCrmBranchDTO dto);
     /**
-     * 判断分类是否存在
+     * 判断是否存在
      * @param dto
      * @return
      */
     boolean isExit(TCrmBranchDTO dto);
+
+    /**
+     * 修改
+     * @param dto
+     * @return
+     */
+    R<Boolean> updateBranch(TCrmBranchDTO dto);
+
+    /**
+     * 导出
+     * @param query
+     * @return
+     */
+    List<TCrmBranchExport> exportList(TCrmBranchQuery query);
 }

--
Gitblit v1.7.1