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/Gy_RoutingBillSub.cs | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Models/Gy_RoutingBillSub.cs b/WebAPI/Models/Gy_RoutingBillSub.cs
index 676dac9..6ad1cc4 100644
--- a/WebAPI/Models/Gy_RoutingBillSub.cs
+++ b/WebAPI/Models/Gy_RoutingBillSub.cs
@@ -85,5 +85,8 @@
public bool HQCProc;//銆婃槸鍚︽湯妫�锛堝閫夋鎵撳嬀锛夈��
public bool HQCPatrol;//銆婃槸鍚﹀贰妫�锛堝閫夋鎵撳嬀锛� 銆�
public bool HMaterToSourceCtrl;//銆婁笂鏂欓槻閿欐帶锛堝閫夋鎵撳嬀锛� 銆�
+
+ public decimal HSubStdEmpAvg_S;//浜х嚎浜哄潎浜ц兘
+ public decimal HYDCoefficient;//绾﹀綋绯绘暟
}
}
\ No newline at end of file
--
Gitblit v1.9.1