From 6e4713d36e144f8c6e67ed780e20004734818f84 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 19 八月 2025 13:55:18 +0800
Subject: [PATCH] 新增工序汇报单同步至金蝶云调用方法;新增直接调拨免扫码模块,扫描源单、上传生成单据调用方法

---
 WebAPI/Models/Gy_WorkPayType.cs |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/WebAPI/Models/Gy_WorkPayType.cs b/WebAPI/Models/Gy_WorkPayType.cs
index 8d9cb07..f3c0d96 100644
--- a/WebAPI/Models/Gy_WorkPayType.cs
+++ b/WebAPI/Models/Gy_WorkPayType.cs
@@ -16,20 +16,11 @@
         public long HLevel { get; set; }
         public bool HEndFlag { get; set; }      //鏈骇鏍囧織
         public bool HStopflag { get; set; }     //绂佺敤鏍囧織
-<<<<<<< HEAD
-      
-        public string HRemark { get; set; }       //澶囨敞
-        public string HUseFlag { get; set; }      //浣跨敤鏍囧織
-       
-
-       
-=======
 
         public string HRemark { get; set; }       //澶囨敞
         public string HUseFlag { get; set; }      //浣跨敤鏍囧織
 
 
 
->>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1