From 93c3423f0fdb79500b3779e2fcbd3a041be061fd Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:19 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/Common/R.cs | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index b0096f8..1cad322 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -1201,6 +1201,7 @@
/// 璇烽噸鏂板皾璇�
/// </summary>
public const int PleaseTryAgain = 1158;
+<<<<<<< HEAD
/// <summary>
/// 绠＄悊鍛樻潈闄愯浆绉�
/// </summary>
@@ -1237,6 +1238,9 @@
/// 杩佺Щ鎴愬姛锛屾偍鐨勬潈闄愬皢鍙樹负鏅�氭垚鍛�
/// </summary>
public const int TransferreSuccessMsg1 = 1167;
+=======
+
+>>>>>>> parent of 3861152e (Merge branch 'tzy2' into newBranch1)
public const int keshiduijiang = 4000;
public const int tonghuajilu = 4001;
--
Gitblit v1.8.0