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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/Device/CommonForm/SelectTime.cs

@@ -123,7 +123,6 @@
            {
                AddTime(timeLayout, t);
            }

        }

        /// <summary>
@@ -208,9 +207,6 @@
            }

        }


       

        /// <summary>
        /// Close