From c9f2d8386d02da81fe65479e7ecd53fc0c8c7569 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 01 十一月 2021 10:24:24 +0800
Subject: [PATCH] nothing
---
WebAPI/Models/Gy_WorkType.cs | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Models/Gy_WorkType.cs b/WebAPI/Models/Gy_WorkType.cs
index 77d0eb1..34a1a24 100644
--- a/WebAPI/Models/Gy_WorkType.cs
+++ b/WebAPI/Models/Gy_WorkType.cs
@@ -21,8 +21,14 @@
public string HForEmp { get; set; } //鐭唬鐮�
public string HRemark { get; set; } //澶囨敞
public string HUseFlag { get; set; } //浣跨敤鏍囧織
+<<<<<<< HEAD
+=======
+
+
+
+>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
}
}
\ No newline at end of file
--
Gitblit v1.9.1