Merge remote-tracking branch 'origin/newBranch1' into WJC

xm

2021-11-24 1802b849f0dadc81644fb0a706d6fb45efdf2a20

 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();