From 1b42f39e34492ba8d4ce6336cc913877b9e064cb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:30:05 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/Common/R.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 94a20d2..377792c 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,9 +4,6 @@
{
public static class StringId
{
- public const int Retry = 378;
- public const int QRCodeIsInvalid = 377;
- public const int WellComBackHome = 376;
public const int GatewayOfflineCannotCreateScene = 375;
public const int ResidenceDeletedSwitchToAnotherResidence = 374;
public const int AddFloorFail = 373;
@@ -512,7 +509,9 @@
public const int leaveMode = 7066;
public const int ordinaryMode = 7067;
public const int timeMode = 7068;
-
+ public const int logicnull = 7069;
+ public const int secnenull = 7070;
+
--
Gitblit v1.8.0