From d69f3b187fbf58480cfa1b7d93bb8fef0debb01d Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 01 十一月 2021 11:05:40 +0800
Subject: [PATCH] nothing
---
WebAPI/Models/Gy_OrderBackInfo.cs | 22 +---------------------
1 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/WebAPI/Models/Gy_OrderBackInfo.cs b/WebAPI/Models/Gy_OrderBackInfo.cs
index ff6a493..53c3b5d 100644
--- a/WebAPI/Models/Gy_OrderBackInfo.cs
+++ b/WebAPI/Models/Gy_OrderBackInfo.cs
@@ -1,16 +1,8 @@
-<<<<<<< HEAD
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-=======
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
-
->>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
+
namespace WebAPI.Models
{
public class Gy_OrderBackInfo
@@ -22,7 +14,6 @@
public long HParentID { get; set; } //鐖剁骇ID
public long HLevel { get; set; } //灞傜骇
public long HEndFlag { get; set; } //
-<<<<<<< HEAD
public string HHelpCode { get; set; } // 鍔╄鐮�
@@ -32,16 +23,5 @@
public bool HUseFlag { get; set; } //浣跨敤鐘舵��
-=======
-
- public string HHelpCode { get; set; } // 鍔╄鐮�
-
- public string HRemark { get; set; } //澶囨敞
-
- public bool HStopflag { get; set; } //绂佺敤鏍囧織
-
- public bool HUseFlag { get; set; } //浣跨敤鐘舵��
-
->>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
}
}
\ No newline at end of file
--
Gitblit v1.9.1