Merge branch 'WJC' into wxr4

wxr

2021-04-28 cc48110a814477bc0d01615f9844aea6ff2b609f

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

@@ -838,7 +838,7 @@
                            continue;
                        }

                        var sensorType = sr.spk.Split(".")[0];
                        var sensorType = sr.spk.Split(".")[1];
                        var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId,sensorType);

                        if (revertObj != null)