From 1070eb501c0075e3f40f4506c2d9e5ddb9c597b9 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 09 四月 2025 16:20:33 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java b/basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java
index ce6219d..093a285 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.ProductDTO1;
-import com.ruoyi.basic.excel.StructureTestObjectData;
+import com.ruoyi.basic.dto.StructureTestObjectDto;
import com.ruoyi.basic.pojo.Product;
import java.util.List;
@@ -24,7 +24,7 @@
int delProduct(Integer id);
- void importPartExcel(List<StructureTestObjectData> list);
-
int updateWorkShop(Integer productId, Integer workShopId, String name);
+
+ int updateObjectWorkShop(StructureTestObjectDto structureTestObjectDto);
}
--
Gitblit v1.9.3