Merge branch 'wjc'

JLChen

2021-03-04 ac3c6b64df51443519d3a27fa8cf0d25dd6ff6d7

 Crabtree/SmartHome/HDL/Common/CommonUtlis.cs

@@ -649,6 +649,7 @@

        /// <summary>
        /// 本地Common匹配云端的FunctionList 返回Function
        /// 匹配子网号、设备号、回路号、大类小类
        /// </summary>
        /// <param name="common">本地设备</param>
        /// <returns></returns>
@@ -659,7 +660,8 @@
            foreach (var function in FunctionList) {
                if (common.SubnetID == function.bus.SubnetID &&
                    common.DeviceID == function.bus.DeviceID &&
                    common.LoopID == function.bus.LoopId
                    common.LoopID == function.bus.LoopId &&
                    common.DeviceTypeString == function.DeviceTypeString
                    ) {
                    return function;
                }