Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-07-13 91a88471d84246524548a318aec1f22735cfedc9

 screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java

@@ -20,14 +20,16 @@
    @Transactional
    Map<String, Object> insertOne(DeviceAdjustValue deviceAdjustValue);

    Map<String,Object> getDataByCondition(Map map);
    Map<String, Object> getDataByCondition(Map map);

    @Transactional
    Map<String,Object> updateOne(Map map);
    Map<String, Object> updateOne(Map map);

    @Transactional
    Map<String,Object> deleteOne(Map map);
    Map<String, Object> deleteOne(Map map);

    Map<String,Object> getTimeSlot(Map map);
    Map<String, Object> getTimeSlot(Map map);

    Map<String,Object> refreshRedis();

}