From ebe0e19399a5126c03c90be819ad1a9168e1992b Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 01 十一月 2021 13:25:54 +0800
Subject: [PATCH] nothing
---
WebAPI/Models/Gy_OrderLevList.cs | 29 +++++------------------------
1 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/WebAPI/Models/Gy_OrderLevList.cs b/WebAPI/Models/Gy_OrderLevList.cs
index 82f4f07..ef9ac5d 100644
--- a/WebAPI/Models/Gy_OrderLevList.cs
+++ b/WebAPI/Models/Gy_OrderLevList.cs
@@ -1,16 +1,13 @@
-<<<<<<< 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
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
namespace WebAPI.Models
{
public class Gy_OrderLevList
@@ -18,7 +15,6 @@
public long HItemID { get; set; } //ID
public string HNumber { get; set; } //浠ｇ爜
public string HName { get; set; } //鍚嶇О
-<<<<<<< HEAD
public string HShortNumber { get; set; } //鐭唬鐮�
public long HParentID { get; set; } //鐖剁骇ID
public long HLevel { get; set; } //灞傜骇
@@ -32,21 +28,6 @@
public bool HUseFlag { get; set; } //浣跨敤鐘舵��
-=======
- public string HShortNumber { get; set; } // 鐭唬鐮�
- public long HParentID { get; set; } //鐖剁骇ID
- public long HLevel { get; set; } //灞傜骇
- public long HEndFlag { get; set; }
-
- public string HHelpCode { get; set; } // 鍔╄鐮�
-
- public string HRemark { get; set; } // 澶囨敞
-
- public bool HStopflag { get; set; } //绂佺敤鏍囧織
-
- public bool HUseFlag { get; set; } //浣跨敤鐘舵��
-
->>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
public string HYX { get; set; }//浼樺厛绾�
}
}
\ No newline at end of file
--
Gitblit v1.9.1