From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
index 71d375c..c453761 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
@@ -2,14 +2,14 @@
import com.yuanchu.limslaboratory.pojo.Plan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
+import com.yuanchu.limslaboratory.pojo.vo.FinPlanVo;
+import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import java.util.List;
-import java.util.Map;
/**
* <p>
- * Mapper 鎺ュ彛
+ * Mapper 鎺ュ彛
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -18,8 +18,8 @@
public interface PlanMapper extends BaseMapper<Plan> {
//鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�
- Map selectAllPlan(int pageSize, int countSize, Integer state);
+ List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state);
//鏌ヨ鎴愬搧妫�楠�
- List<PlanDto> selectInspection(int pageSize, int countSize, Integer state);
+ List<FinPlanVo> selectInspection(int pageSize, int countSize, Integer state);
}
--
Gitblit v1.9.3