Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Switch branch/tag
  1. 22 Nov, 2023 1 commit
  3. 21 Nov, 2023 4 commits
  5. 17 Nov, 2023 5 commits
  7. 16 Nov, 2023 6 commits
  9. 15 Nov, 2023 7 commits
  11. 14 Nov, 2023 11 commits
  13. 13 Nov, 2023 2 commits
  15. 10 Nov, 2023 4 commits
    • fix：长者信息 · af5d861b
      huangjy committed
    • fix：证件号和长者信息全匹配 · 4f99ac8f
      huangjy committed
    • fix：合并问题 · 87deb9e6
      huangjy committed
    • 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