Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL

JLChen

2020-11-23 eb51679c618d5027070fbd6f3c0519f0f17e7d7d

 HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs

@@ -129,7 +129,7 @@

            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView(socketFunction, actionRefresh);
            new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView_FunctionTop(socketFunction, actionRefresh);

        }