From fc39fb3b951d6ac4e4e4de836091d671ec00c14d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 05 六月 2024 15:00:54 +0800
Subject: [PATCH] 1.更新菜单栏，报工台跳转过来时，根据物料+工序+生产资源带出对应清单信息 2.报工台跳转过来时，根据物料带出对应产品防错验证清单清单信息
---
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