From ec1f20c31d64ddbc5242c3942902bc5233a8a140 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 四月 2025 10:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java
index f1e6f22..487aef2 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java
@@ -1,10 +1,12 @@
package com.ruoyi.inspect.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.inspect.dto.InsProductBindingDto;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsProduct;
+import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours;
import java.util.List;
import java.util.Map;
@@ -22,7 +24,7 @@
boolean write(InsOrder insOrder);
- Map<String,Object> selectNoProducts(Page page, InsProduct insProduct,Integer orderId,String ids);
+ IPage<InsProduct> selectNoProducts(Page page, InsProduct insProduct, Integer orderId, String ids);
void checkUpdate(Integer orderId,Integer state);
--
Gitblit v1.9.3