# Conflicts:
#	src/main/java/com/esv/datacenter/iot/module/devicemodel/entity/DeviceInstanceEntity.java
#	src/main/java/com/esv/datacenter/iot/module/devicemodel/service/DeviceInstanceService.java
#	src/main/java/com/esv/datacenter/iot/module/devicemodel/service/impl/DeviceInstanceServiceImpl.java