Merge branch 'WJC' into newBranch1

wxr

2021-11-19 a170a2ecef6d5c87883ed552dbbc81cfb0358d13

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs

@@ -46,7 +46,7 @@
            //viewLayout.AddChidren(banbenshengjiFL.FLayoutView());


            var versions = Pir.currPir.versions.Find((c) => c.module == "FW");
            var versions = Pir.currPir.versions.Find((c) => c.module.Contains("FW"));
            if (versions == null)
            {
                versions = new Entity.VersionInfo();