
# Conflicts: # fastbee-open-api/src/main/java/com/fastbee/data/controller/devicedetail/DeviceDetailController.java # fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/IDeviceDetailService.java # fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java