From 0d820b2125e80c510e55ec85766092fab11ba5e1 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 12 七月 2023 11:49:37 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 4 +++-
phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java | 7 +++++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
index adb4238..6d9e6b9 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
@@ -3,6 +3,8 @@
import lombok.Data;
+import java.util.List;
+
/**
* @author ChenJiaHe
* 鍒嗛〉鎵╁睍绫�*/
@@ -20,7 +22,7 @@
private String parentId;
/**鍒嗙被鏍囪瘑*/
private String typeId;
-
+ private List<String> typeIdList;
//appid
private String appId;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java
index d8386a2..a5717d4 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java
@@ -27,4 +27,11 @@
*/
@PostMapping(value = "/channels/list")
Result getChannelsList(@RequestBody PageDto pageDto);
+
+ /**
+ * 鑾峰彇娓犻亾鍒楄〃-娓犻亾澶х被
+ * @return Result
+ */
+ @PostMapping(value = "/channels/type/list")
+ Result getChannelsListByType(@RequestBody PageDto pageDto);
}
--
Gitblit v1.8.0