From 47b45a4ac3284936515a2edd3e50265de30993a0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 04 六月 2025 14:50:23 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Models/基础资料/Gy_Process.cs | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
index 5b9dc1a..297959a 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
@@ -10,6 +10,7 @@
public long HItemID { get; set; }
public string HNumber { get; set; } // 浠ｇ爜
public string HName { get; set; } //
+ public string HProcType { get; set; } // 宸ュ簭鍒嗙被
public string HHelpCode { get; set; } //鍔╄鐮�
public string HShortNumber { get; set; } //鐭唬鐮�
public bool HEndFlag { get; set; } //鏈骇鏍囧織
--
Gitblit v1.9.1