Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

BasicData/Tnb.BasicData.Entitys/Entity/BasEbomH.cs

@@ -117,6 +117,14 @@ namespace Tnb.BasicData.Entities
        /// </summary>           
        [SugarColumn(ColumnName="modify_id")]
        public string modify_id {get;set;}
+       
+       /// <summary>
+       /// Desc:仅用于关联表字段查询用不存储数据
+       /// Default:NULL::character varying
+       /// Nullable:True
+       /// </summary>           
+       [SugarColumn(ColumnName="query_info")]
+       public string query_info {get;set;}
 
     }
 }

BasicData/Tnb.BasicData.Entitys/Entity/BasMbom.cs

@@ -125,5 +125,12 @@ namespace Tnb.BasicData.Entities
        /// </summary>           
        public string modify_id {get;set;}
 
+       /// <summary>
+       /// Desc:仅用于关联表字段查询用不存储数据
+       /// Default:NULL::character varying
+       /// Nullable:True
+       /// </summary>           
+       [SugarColumn(ColumnName="query_info")]
+       public string query_info {get;set;}
     }
 }