From 102334b2ab255b279f9c492b146276baeb2910d1 Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期四, 28 九月 2023 14:38:37 +0800
Subject: [PATCH] 计量单位列表：增加 审核，反审核，禁用，反禁用，按钮设置 等按钮；并修改视图，将 审核人，审核日期，禁用人，禁用日期 4列 显示出来；
---
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