From 71e5f5614c403ed7cda5de7bc5f25e026c1f8f93 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 10 三月 2025 19:17:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Models/基础资料/ConkType.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/ConkType.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/ConkType.cs"
index a583e27..c6af484 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/ConkType.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/ConkType.cs"
@@ -21,11 +21,11 @@
public DateTime HMakeTime { get; set; } //寤虹珛鏃堕棿
public string HMakeEmp { get; set; } //鍒涘缓浜�
public string HCheckEmp { get; set; } //瀹℃牳浜�
- public DateTime HCheckTime { get; set; } //瀹℃牳浜�
+ public string HCheckTime { get; set; } //瀹℃牳浜�
public string HModifyEmp { get; set; } //淇敼浜�
- public DateTime HModifyTime { get; set; } //淇敼鏃堕棿
+ public string HModifyTime { get; set; } //淇敼鏃堕棿
public string HStopEmp { get; set; } //绂佺敤浜�
- public DateTime HStopTime { get; set; } //绂佺敤鏃堕棿
+ public string HStopTime { get; set; } //绂佺敤鏃堕棿
public long HUSEORGID { get; set; } //浣跨敤缁勭粐
public long HCREATEORGID { get; set; } //鍒涘缓缁勭粐
}
--
Gitblit v1.9.1