From 14949a6a6e7dec654d13e75f46b24319a624ff8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:13:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 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