From 81695c67562b55493a2e98263223c5440e28feed Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 14:18:58 +0800
Subject: [PATCH] 合并fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetMngService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetMngService.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetMngService.java
index 948ce02..d7ce476 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetMngService.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetMngService.java
@@ -5,6 +5,7 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngQueryCriteria;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetMngDto;
import java.io.Serializable;
import java.util.List;
@@ -17,7 +18,7 @@
* @since 2022-07-20 11:49:22
*/
public interface TargetMngService extends IService<TargetMng> {
- ResultVO queryAll(PageQuery<TargetMngQueryCriteria> pageQuery);
+ ResultVO<List<TargetMngDto>> queryAll(PageQuery<TargetMngQueryCriteria> pageQuery);
List<TargetMng> queryAll(TargetMngQueryCriteria criteria);
--
Gitblit v1.9.2