From 63610047f4921b0bdcb0042f54c5197b62746446 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 15 八月 2023 14:28:42 +0800
Subject: [PATCH] 异常工时申请单：添加子表重复校验，子表做颜色区分，子表单元格根据宽度隐藏内容，取消分页，添加合计行，根据职员带出工作中，取消上一行下一行
---
WebAPI/Models/Gy_WorkType.cs | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Models/Gy_WorkType.cs b/WebAPI/Models/Gy_WorkType.cs
index 34a1a24..c1a9184 100644
--- a/WebAPI/Models/Gy_WorkType.cs
+++ b/WebAPI/Models/Gy_WorkType.cs
@@ -21,14 +21,8 @@
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