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

kaiyu

2021-06-24 eb51b2364e9a3fbe806fde61fa255660a098fc8b

 screen-manage/src/main/java/com/moral/api/controller/DeviceController.java

@@ -56,7 +56,7 @@
        //判断mac是否已存在
        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("mac", device.getMac());
        if (deviceService.getOne(queryWrapper) != null) {
        if (deviceService.count(queryWrapper) > 0) {
            return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
        }
        deviceService.insert(device);