From 3771512ff8b1f4bd6c40cdcdff58b3a64cee78b1 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 14 Nov 2023 13:50:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-api/src/main/java/com/moral/api/service/ProfessionService.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/ProfessionService.java b/screen-api/src/main/java/com/moral/api/service/ProfessionService.java
index eb1e8d7..dc9487f 100644
--- a/screen-api/src/main/java/com/moral/api/service/ProfessionService.java
+++ b/screen-api/src/main/java/com/moral/api/service/ProfessionService.java
@@ -1,6 +1,5 @@
package com.moral.api.service;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -13,5 +12,5 @@
Set<Map<String, Object>> getSensorByProfessionsAndOrganizationId(Map<String, Object> params);
//���������������
- List<Map<String, Object>> professionContribution(Map<String, Object> params);
+ Map<String, Object> professionContribution(Map<String, Object> params);
}
--
Gitblit v1.8.0