From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/R.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index b71297d..732e838 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -379,7 +379,7 @@
public readonly static int Sunrisesunset = 5134;
public readonly static int cycle = 5135;
public readonly static int completeNext = 5136;
- public readonly static int Selectedtimetype = 5137;
+ public readonly static int Selectedtimetype= 5137;
public readonly static int Timecondition = 5138;
public readonly static int condition = 5139;
public readonly static int pushset = 5140;
@@ -591,6 +591,7 @@
public readonly static int application = 5376;
public readonly static int automationaddtext = 5377;
public readonly static int tiptextnull = 5378;
+ public readonly static int tiplocktextnull = 5379;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -893,7 +894,7 @@
/// <summary>
- /// 娌℃湁鍔熻兘 璇峰湪涓汉涓績涓�--璁惧绠＄悊澶勬坊鍔�
+ /// 娌℃湁鍔熻兘 璇峰湪涓汉涓績--璁惧绠＄悊澶勬坊鍔�
/// </summary>
public const int NoFunction = 11010;
/// <summary>
@@ -4722,7 +4723,7 @@
/// </summary>
public const int uSubmit = 15922;
/// <summary>
- /// 鎻愪氦鎴愬姛,鎰熻阿鎮ㄧ殑鎰忚
+ /// 鎮ㄧ殑鍙嶉宸叉垚鍔熸彁浜�
/// </summary>
public const int uSubmitSuccessMsg = 15923;
/// <summary>
--
Gitblit v1.8.0