From 29bf38f64c14321cf435e897c396111e92ab03a7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 26 五月 2025 16:49:52 +0800
Subject: [PATCH] 解决合并冲突
---
WebAPI/Models/ClsGy_PatrolCheck.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Models/ClsGy_PatrolCheck.cs b/WebAPI/Models/ClsGy_PatrolCheck.cs
index c463965..c72dd80 100644
--- a/WebAPI/Models/ClsGy_PatrolCheck.cs
+++ b/WebAPI/Models/ClsGy_PatrolCheck.cs
@@ -18,7 +18,7 @@
public bool HStopflag; //绂佺敤鏍囧織
public string HRemark; //澶囨敞
public string HMakeEmp;
- public string HPatrolCheckType;
+ public string HPatrolCheckItemType;
public string HUseFlag = "鏈娇鐢�";
public Int64 HPatrolCheckItemClassID; //宸℃椤圭洰鍒嗙被
--
Gitblit v1.9.1