From 098386f316ecaa7122bc979809d8160db81304ed Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期四, 06 二月 2025 18:17:26 +0800 Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwDeviceService.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwDeviceService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwDeviceService.java index b32779c..ef46e18 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwDeviceService.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwDeviceService.java @@ -6,6 +6,7 @@ import com.doumee.dao.business.model.YwDevice; import com.doumee.dao.business.vo.YwDeviceCateDataVO; import com.doumee.dao.business.vo.YwDeviceDataVO; +import com.doumee.dao.business.vo.YwDeviceParentCateDataVO; import com.doumee.dao.business.vo.YwDeviceStatusDataVO; import java.util.List; @@ -108,7 +109,7 @@ YwDevice findByCode(String deviceCode); - Set<YwDeviceCateDataVO> getDeviceCateData(YwDevice model); + Set<YwDeviceParentCateDataVO> getDeviceCateData(YwDevice model); YwDeviceStatusDataVO getDeviceStatus(YwDevice model); } -- Gitblit v1.9.3