Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-06-23 6f12948893fcc846dfb32aa861c473a842edcd56

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

@@ -22,4 +22,12 @@

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

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

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

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

}