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_WorkPayType.cs | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Models/Gy_WorkPayType.cs b/WebAPI/Models/Gy_WorkPayType.cs
index 8d9cb07..c6c566c 100644
--- a/WebAPI/Models/Gy_WorkPayType.cs
+++ b/WebAPI/Models/Gy_WorkPayType.cs
@@ -16,20 +16,10 @@
public long HLevel { get; set; }
public bool HEndFlag { get; set; } //鏈骇鏍囧織
public bool HStopflag { get; set; } //绂佺敤鏍囧織
-<<<<<<< HEAD
public string HRemark { get; set; } //澶囨敞
public string HUseFlag { get; set; } //浣跨敤鏍囧織
-
-
-
-=======
-
- public string HRemark { get; set; } //澶囨敞
- public string HUseFlag { get; set; } //浣跨敤鏍囧織
-
->>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
}
}
\ No newline at end of file
--
Gitblit v1.9.1