From a332264920c9cd9226d566c19e36e5d5b5549c1b Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 12 Aug 2019 15:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java
index 6824615..df6c2f4 100644
--- a/src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java
@@ -55,11 +55,11 @@
adjustValueMapper.updateByPrimaryKeySelective(adjustValue);
}
// ���������redis
- Map<String,Float> adjustMap = new HashMap<>();
+ Map<String,String> adjustMap = new HashMap<>();
if(adjustValue.getValue()!=null&&!adjustValue.getValue().isEmpty()){
- for(Map.Entry<String,Float> entry:adjustValue.getValue().entrySet()){
+ for(Map.Entry<String,String> entry:adjustValue.getValue().entrySet()){
+ adjustMap.put(entry.getKey(),entry.getValue());
if(entry.getValue()!=null){
- adjustMap.put(entry.getKey(),entry.getValue());
}
}
if(!adjustMap.isEmpty()){
--
Gitblit v1.8.0