From 2cc5a1afe8296d148f0a32989395d538e5323a8e Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期四, 18 一月 2024 16:22:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/IBsWorkshopInfoService.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/IBsWorkshopInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/IBsWorkshopInfoService.java
index 11a57da..5f6d834 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/IBsWorkshopInfoService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/IBsWorkshopInfoService.java
@@ -1,6 +1,8 @@
 package com.jcdm.main.bs.workshop.service;
 
 import java.util.List;
+
+import com.jcdm.common.core.domain.entity.SysUser;
 import com.jcdm.main.bs.workshop.domain.BsWorkshopInfo;
 
 /**
@@ -58,4 +60,7 @@
      * @return 缁撴灉
      */
     public int deleteBsWorkshopInfoById(Long id);
+
+    public String importWrokshop(List<BsWorkshopInfo> userList, Boolean isUpdateSupport, String operName);
+
 }

--
Gitblit v1.9.3