SANJIAPI.git - Gitblit

			@@ -1,8 +1,16 @@
			<<<<<<< HEAD
			using System;
			using System.Collections.Generic;
			using System.Linq;
			using System.Web;

			=======
			using System;
			using System.Collections.Generic;
			using System.Linq;
			using System.Web;

			>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
			namespace WebAPI.Models
			{
			public class Gy_OrderBackInfo
			@@ -14,6 +22,17 @@
			public long HParentID { get; set; } //父级ID
			public long HLevel { get; set; } //层级
			public long HEndFlag { get; set; } //
			<<<<<<< HEAD

			public string HHelpCode { get; set; } // 助记码

			public string HRemark { get; set; } //备注

			public bool HStopflag { get; set; } //禁用标志

			public bool HUseFlag { get; set; } //使用状态

			=======

			public string HHelpCode { get; set; } // 助记码

			@@ -23,5 +42,6 @@

			public bool HUseFlag { get; set; } //使用状态

			>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
			}
			}