Merge remote-tracking branch 'origin/master'

MercuryZ

2022-10-18 ea94079e74182be590b9fff356c97f522d9a7828

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java

@@ -19,8 +19,8 @@
    Reboot("10"),
    //  设置心跳包间隔
    SettingHeartBeatTime("11"),
    //设置地址
    SettingAddress("12"),
//    //设置地址
//    SettingAddress("12"),
    //传感器功能开关
    SensorSwitch("13"),
    //设置数据修正值-温度