Merge branch 'Dev-Branch' into wxr-2.0

wxr

2023-07-25 0f19b35176d6ef1c17a98d942b3d629c46215213

 HDL_ON/UI/UI2/FuntionControlView/ArmSensor/ArmSensorHistroyPaging.cs

@@ -46,6 +46,10 @@
                    int pageCount = 1;
                    var pm = new DAL.Server.HttpServerRequest();
                    var pack = pm.GetArmSensorHistory(device.deviceId, "20", "1");
                    if (pack == null)
                    {
                        return;
                    }
                    var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<Cloud_ArmSensorHistory>(pack.Data.ToString());
                    List<string> years = new List<string>();
                    if (revData == null)