Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

SGGL/Model/Model.cs

@@ -120367,6 +120367,8 @@ namespace Model
 		
 		private string _InspectionId;
 		
+		private string _Factory;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Base_Unit> _Base_Unit;
@@ -120407,6 +120409,8 @@ namespace Model
     partial void OnCompileDateChanged();
     partial void OnInspectionIdChanging(string value);
     partial void OnInspectionIdChanged();
+    partial void OnFactoryChanging(string value);
+    partial void OnFactoryChanged();
     #endregion
 		
 		public Material_Equipment()
@@ -120729,6 +120733,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Factory", DbType="NVarChar(100)")]
+		public string Factory
+		{
+			get
+			{
+				return this._Factory;
+			}
+			set
+			{
+				if ((this._Factory != value))
+				{
+					this.OnFactoryChanging(value);
+					this.SendPropertyChanging();
+					this._Factory = value;
+					this.SendPropertyChanged("Factory");
+					this.OnFactoryChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Material_Equipment_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{