代码合并

src/main/java/com/esv/datacenter/iot/module/devicemodel/service/DeviceInstanceService.java

@@ -2,6 +2,7 @@ package com.esv.datacenter.iot.module.devicemodel.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.esv.datacenter.iot.common.vo.PageResultVO;
+import com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceDto;
 import com.esv.datacenter.iot.module.devicemodel.entity.DeviceInstanceEntity;
 import com.esv.datacenter.iot.module.devicemodel.form.DeviceInstanceForm;
 import com.esv.datacenter.iot.module.devicemodel.vo.DeviceInstanceVO;

src/main/java/com/esv/datacenter/iot/module/devicemodel/service/impl/DeviceInstanceServiceImpl.java

 package com.esv.datacenter.iot.module.devicemodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;