Merge branch 'CJL' into NewFilePath

wxr

2020-12-16 f5a49299caaf1fdca7503ae682da13c6fda887c6

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs

@@ -904,8 +904,8 @@
                            i++;
                            continue;
                        }
                        var revertObj = new HttpServerRequest().GetSensorHistory(sr.bus_Data.SubnetID, sr.bus_Data.DeviceID,
                               5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus_Data.loopId, curMonth,
                        var revertObj = new HttpServerRequest().GetSensorHistory(sr.bus.SubnetID, sr.bus.DeviceID,
                               5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus.loopId, curMonth,
                               DB_ResidenceData.Instance.residenceGatewayMAC);

                        if (revertObj != null)