合并

EquipMgr/Tnb.EquipMgr.Entities/Entity/MoldMaintenance.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities
+{
+    ///<summary>
+    ///模具保养
+    ///</summary>
+    [SugarTable("mold_maintenance")]
+    public partial class MoldMaintenance
+    {
+           public MoldMaintenance(){
+
+
+           }
+           /// <summary>
+           /// Desc:编号
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public string id {get;set;}
+
+           /// <summary>
+           /// Desc:所属组织
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string? org_id {get;set;}
+
+           /// <summary>
+           /// Desc:项目
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string? name {get;set;}
+
+           /// <summary>
+           /// Desc:描述
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string? descrip {get;set;}
+
+           /// <summary>
+           /// Desc:备注
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string? remark {get;set;}
+
+           /// <summary>
+           /// Desc:查看照片
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string? image {get;set;}
+
+           /// <summary>
+           /// Desc:扩展
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string? extras {get;set;}
+
+           /// <summary>
+           /// Desc:创建用户
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string? create_id {get;set;}
+
+           /// <summary>
+           /// Desc:创建时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? create_time {get;set;}
+
+           /// <summary>
+           /// Desc:修改用户
+           /// Default:NULL::character varying
+           /// Nullable:True
+           /// </summary>           
+           public string? modify_id {get;set;}
+
+           /// <summary>
+           /// Desc:修改时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? modify_time {get;set;}
+
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroupItem.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Text;
 using JNPF.Common.Security;
 using SqlSugar;
+using Tnb.Common.Contracts;
 
 namespace Tnb.EquipMgr.Entities
 {
@@ -16,11 +17,11 @@ namespace Tnb.EquipMgr.Entities
 
 
            }
-           /// <summary>
+        /// <summary>
            /// Desc:主键
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
            [SugarColumn(IsPrimaryKey=true)]
            public string id {get;set;} = SnowflakeIdHelper.NextId();
 
@@ -31,11 +32,11 @@ namespace Tnb.EquipMgr.Entities
            /// </summary>           
            public string? item_group_id {get;set;}
 
-           /// <summary>
-           /// Desc:保养项id
+        /// <summary>
+        /// Desc:保养项id
            /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
+        /// Nullable:True
+        /// </summary>           
            public string? item_id {get;set;}
 
     }

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroupRelation.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Text;
 using JNPF.Common.Security;
 using SqlSugar;
+using Tnb.Common.Contracts;
 
 namespace Tnb.EquipMgr.Entities
 {
@@ -14,7 +15,7 @@ namespace Tnb.EquipMgr.Entities
     {
            public ToolMoldMaintainGroupRelation(){
 
-
+          
            }
            /// <summary>
            /// Desc:主键