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

kaiyu

2021-09-14 82841afc4e140f72fdeb378102e0e9a978bbe14c

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

@@ -12,7 +12,6 @@
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import com.moral.api.service.GovMonitorPointService;
import com.moral.api.service.SysDictDataService;
import com.moral.api.util.CacheUtils;
import com.moral.api.util.AdjustDataUtils;