-
# Conflicts: # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
-
Merge pull request !1366 from puhui999/master-jdk17
-
fix(微信小程序确认收货提醒接口): 修复 #839 - received_time 时间戳单位错误（应为秒）
-
Excel导出时，下拉选择列错位问题修改
-
Merge pull request !1357 from SuchJack/master-jdk17-dev
-
Merge pull request !1354 from dhb52/master-jdk17
-
Merge pull request !1358 from SuchJack/master-jdk17-dev1
-
Merge pull request !1359 from SuchJack/master-jdk17-dev2
