Merge branch 'temp-wxr' into NewFilePath

wxr

2021-03-02 7ef9d95ad31883e85bf5d5eab85c30f70d601077

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -91,9 +91,9 @@
                                    ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
                                    ShowFunction.FloorHeating,ShowFunction.Music,
                                    ShowFunction.Electric,ShowFunction.Environmental,
                                    //ShowFunction.EnergyMonitoring,
                                    //ShowFunction.FreshAir,ShowFunction.DoorLock,
                                    //ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                    ShowFunction.EnergyMonitoring,
                                    ShowFunction.FreshAir,ShowFunction.DoorLock,
                                    ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                    ShowFunction.Sensor,ShowFunction.VideoIntercom
                                });
                            instance.SaveResidenceData();