HStation/XHS.V1.0.git

			@@ -6,14 +6,13 @@
			{
			this.ID = rhs.ID;
			this.Name = rhs.Name;
			this.Description = rhs.Description;
			this.SortCode = rhs.SortCode;
			this.ID = rhs.ID;
			this.Name = rhs.Name;
			this.Description = rhs.Description;
			this.Caliber = rhs.Caliber;
			this.Material = rhs.Material;
			this.SeriesID = rhs.SeriesID;
			this.SortCode = rhs.SortCode;
			this.KeyWord = string.Join(",", rhs.KeyWord);
			this.Coefficient = rhs.MinorLoss;
			this.SortCode = rhs.SortCode;
			this.Description = rhs.Description;
			}

			[DisplayName("ID")]
			@@ -30,9 +29,9 @@
			/// <summary>
			/// 口径
			/// </summary>
			[DisplayName("口径(mm)")]
			[DisplayName("口径")]
			[Browsable(true)]
			public string Caliber { get; set; }
			public double? Caliber { get; set; }

			/// <summary>
			/// 材料
			@@ -70,31 +69,10 @@
			public string Name { get; set; }

			/// <summary>
			/// 创建人
			/// </summary>
			[DisplayName("创建人")]
			[Browsable(false)]
			public string CreateName { get; set; }

			/// <summary>
			/// 创建时间
			/// </summary>
			[DisplayName("创建时间")]
			[Browsable(false)]
			public string CreateTime { get; set; }

			/// <summary>
			/// 识别关键字
			/// </summary>
			[DisplayName("关键字")]
			[Browsable(true)]
			public string KeyWord { get; set; }

			/// <summary>
			/// 阀门设置
			/// </summary>
			[DisplayName("阀门设置")]
			[Browsable(true)]
			public string CompressorSetting { get; set; }
			}
			}