Merge branch 'dev-hxb' into Dev-Wxr-1.8.1

wxr

2023-06-14 313e9339114e672eb2b281ee323f9f480f980679

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacWeekHistoryPage.cs

@@ -20,7 +20,8 @@
        /// room_humidity 湿度
        /// </summary>
        string showType;
            Dictionary<string, double> dataDic = new Dictionary<string, double>();
        Dictionary<string, double> dataDic = new Dictionary<string, double>();

        public CacWeekHistoryPage(Function device,string type)
        {
            bodyView = this;