Merge remote-tracking branch 'origin/jpush_tst' into wxr7

wxr

2021-09-07 95a7e380db583108d9716c56fe6d298ca08f8f23

 HDL_ON/Common/R.cs

@@ -4,6 +4,21 @@
{
    public static class StringId
    {


        //public const int SaveAs
        /// <summary>
        /// 组合调光
        /// </summary>
        public const int CombinedDimming = 511;
        /// <summary>
        /// 
        /// </summary>
        public const int PleaseSelectTheDeploymentTarget = 510;
        /// <summary>
        /// 请输入安防名称
        /// </summary>
        public const int PleaseEnterSecurityName = 509;
        /// <summary>
        /// 甲醛
        /// </summary>