Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs

@@ -190,7 +190,7 @@
        //                var sd = new ShareData();
        //                sd.ShareName = f.sid;
        //                sd.HouseDistributedMark = DB_ResidenceData.residenceData.residecenInfo.RegionID;
        //                sd.ShareDataBytes = DAL.CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
        //                sd.ShareDataBytes = DAL.System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
        //                //sd.SubAccountDistributedMark = memberInfo.SubAccountDistributedMark;
        //                sds.Add(sd);
        //            }