Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

 ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs

old mode 100755
new mode 100644
@@ -168,7 +168,7 @@
             };


        


        }
    }