From 76043587fd6c2c6a4b1bb7a455aef8bd1388a150 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 28 八月 2023 13:53:43 +0800
Subject: [PATCH] 异常反馈单：修复编辑功能子表重复添加问题、子表2添加报错问题 PDA_异常反馈单：设置发送人的阅读状态为已阅
---
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