From 090f4dac98c412c5734a706b853724e2d2accda4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 15:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/DustldService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/DustldService.java b/screen-api/src/main/java/com/moral/api/service/DustldService.java
index 4c322e7..f8efade 100644
--- a/screen-api/src/main/java/com/moral/api/service/DustldService.java
+++ b/screen-api/src/main/java/com/moral/api/service/DustldService.java
@@ -12,10 +12,13 @@
- public Integer getDailyDustld(Map<String, Object> params,MultipartFile file ) throws ParseException;
+ Integer getDailyDustld(Map<String, Object> params,MultipartFile file ) throws ParseException;
- public Map<String,Object> dailyDustld(Integer id ,List<MultipartFile> file);
+ Map<String,Object> dailyDustld(Integer id ,List<MultipartFile> file);
+
+
+ Map<String,Object> dailyDustlds(List<MultipartFile> file,Map<String, Object> params);
Map<String,Object> selectDust(Integer id );
--
Gitblit v1.8.0