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_OrderBackInfo.cs | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Models/Gy_OrderBackInfo.cs b/WebAPI/Models/Gy_OrderBackInfo.cs
index ee8bee3..ff6a493 100644
--- a/WebAPI/Models/Gy_OrderBackInfo.cs
+++ b/WebAPI/Models/Gy_OrderBackInfo.cs
@@ -1,8 +1,16 @@
+<<<<<<< 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
@@ -14,6 +22,17 @@
public long HParentID { get; set; } //鐖剁骇ID
public long HLevel { get; set; } //灞傜骇
public long HEndFlag { get; set; } //
+<<<<<<< HEAD
+
+ public string HHelpCode { get; set; } // 鍔╄鐮�
+
+ public string HRemark { get; set; } //澶囨敞
+
+ public bool HStopflag { get; set; } //绂佺敤鏍囧織
+
+ public bool HUseFlag { get; set; } //浣跨敤鐘舵��
+
+=======
public string HHelpCode { get; set; } // 鍔╄鐮�
@@ -23,5 +42,6 @@
public bool HUseFlag { get; set; } //浣跨敤鐘舵��
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
}
}
\ No newline at end of file
--
Gitblit v1.9.1