Merge remote-tracking branch 'origin/wjc' into feature/v2.7_迭代

wxr

2024-10-14 b847c06d8617efb2cbbad6f11b0344b779138e92

 HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs

@@ -186,7 +186,7 @@
                string key = ene.name;
                if (list.ContainsKey(key))
                {
                    list.Add(ene.name + DateTime.Now.ToLongTimeString(), tt.ToString());
                    list.Add(ene.name + DateTime.Now.Ticks, tt.ToString());
                }
                else
                {