Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-07-22 98c51b309741620d7a9d6bf6260327a6041b8f12

 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;