From 6c1b31728b0dbafeab9b1cce19dac145b972b1b5 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 01 十一月 2021 10:37:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/Models/Gy_WorkPayType.cs b/WebAPI/Models/Gy_WorkPayType.cs
new file mode 100644
index 0000000..8d9cb07
--- /dev/null
+++ b/WebAPI/Models/Gy_WorkPayType.cs
@@ -0,0 +1,35 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+    public class Gy_WorkPayType
+    {
+        public long HItemID { get; set; }
+        public string HNumber { get; set; }       // 浠g爜
+        public string HName { get; set; }         //  
+        public string HHelpCode { get; set; }      //鍔╄鐮�
+        public string HShortNumber { get; set; }   //鐭唬鐮�
+        public long HParentID { get; set; }      //鐖剁骇ID
+        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