Merge remote-tracking branch 'origin/dev' into dev

BasicData/Tnb.BasicData.Entitys/Entity/BasProcessStation.cs

@@ -28,6 +28,12 @@ namespace Tnb.BasicData.Entities
         /// Nullable:False
         /// </summary>           
         public string process_id { get; set; }
+        /// <summary>
+        /// 工序编码
+        /// </summary>
+        public string process_code { get; set; }
+
+
 
         // /// <summary>
         // /// Desc:工序代码
@@ -42,6 +48,10 @@ namespace Tnb.BasicData.Entities
         /// Nullable:False
         /// </summary>           
         public string station_id { get; set; }
+        /// <summary>
+        /// 工位编码
+        /// </summary>
+        public string station_code { get; set; }
 
         // /// <summary>
         // /// Desc:工位代码