From 6c1b31728b0dbafeab9b1cce19dac145b972b1b5 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 01 十一月 2021 10:37:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Models/Gy_OrderLevList.cs | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Models/Gy_OrderLevList.cs b/WebAPI/Models/Gy_OrderLevList.cs
index dc38119..82f4f07 100644
--- a/WebAPI/Models/Gy_OrderLevList.cs
+++ b/WebAPI/Models/Gy_OrderLevList.cs
@@ -1,28 +1,52 @@
+<<<<<<< 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_OrderLevList
{
- public long HItemID { get; set; } ID
- public string HNumber { get; set; } 浠ｇ爜
- public string HName { get; set; } 鍚嶇О
- public string HShortNumber { get; set; } 鐭唬鐮�
- public long HParentID { get; set; } 鐖剁骇ID
- public long HLevel { get; set; } 灞傜骇
+ 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; } //灞傜骇
+ 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; } //浣跨敤鐘舵��
+
+=======
+ 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 HHelpCode { get; set; } // 鍔╄鐮�
- public string HRemark { get; set; } 澶囨敞
+ public string HRemark { get; set; } // 澶囨敞
- public bool HStopflag { get; set; } 绂佺敤鏍囧織
+ public bool HStopflag { get; set; } //绂佺敤鏍囧織
- public bool HUseFlag { get; set; } 浣跨敤鐘舵��
+ public bool HUseFlag { get; set; } //浣跨敤鐘舵��
- public string HYX { get; set; }浼樺厛绾�
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
+ public string HYX { get; set; }//浼樺厛绾�
}
}
\ No newline at end of file
--
Gitblit v1.9.1