Merge branch 'dev' of humingfen/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceInventoryService.java

@@ -139,6 +139,7 @@ public class IotDeviceInventoryService extends BaseJpaService<IotDeviceInventory
                }
                deviceDO.setDel(1);
                deviceDO.setStatus("1");
                deviceDO.setIsGrant(0);
                deviceDO.setInventoryLogId(deviceInventoryLogDO.getId());
                deviceDO.setCreateTime(new Date());
                deviceDO.setUpdateTime(new Date());