Merge branch 'WJC' into newBranch1

wxr

2021-11-19 a170a2ecef6d5c87883ed552dbbc81cfb0358d13

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

@@ -543,6 +543,9 @@
            {
                str = Language.StringByID(StringId.tianjiashibai);
            }
            else if (text== "添加按钮超出30个") {
                str = Language.StringByID(StringId.anniuchaochu30);
            }
            else
            {
                if (responsePackNew != null)