From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java b/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
index 3810dd8..b6d2b5b 100644
--- a/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
+++ b/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
@@ -6,7 +6,6 @@
import java.text.ParseException;
import java.util.List;
import java.util.Map;
-
import com.moral.api.entity.SpecialDevice;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.bo.ExcelBO;
@@ -48,7 +47,7 @@
ExcelBO getDaily(Map<String, Object> params, List<MultipartFile> files) throws ParseException;
//���������������������
- DailyVo loadDaily(Integer id);
+ List<DailyVo> loadDaily(List<Integer> ids);
//������������
--
Gitblit v1.8.0