-
Merge remote-tracking branch 'origin/dev' · c0a94e2a# Conflicts: # db/上线后sql/update.sql # server-common/src/main/java/com/makeit/module/iot/service/IotDevicePropertiesOperateService.java # server-common/src/main/java/com/makeit/module/iot/service/IotProductDeviceService.java # server-module/src/main/java/com/makeit/module/controller/children/alarm/PlatAlarmRecordChildrenController.java # server-service/src/main/java/com/makeit/dto/wechat/device/PlatDeviceAttrWechatDTO.java # server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java # server-service/src/main/java/com/makeit/service/platform/device/PlatDeviceService.java # server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java # server-service/src/main/java/com/makeit/service/platform/elder/PlatElderService.java # server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java # server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderReportMonthServiceImpl.java # server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderSleepServiceImpl.java
huangjy committed