From 1c71308504530e589b753f18862a3f99149229dc Mon Sep 17 00:00:00 2001 From: 刘磊 <1161824510@qq.com> Date: 星期六, 23 十一月 2024 15:28:57 +0800 Subject: [PATCH] 合并 --- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationManager.cs | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationManager.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationManager.cs index bb406df..56cc6bf 100644 --- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationManager.cs +++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationManager.cs @@ -17,16 +17,11 @@ using Magicodes.ExporterAndImporter.Core; using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using WIDESEAWCS_Core.DB.Models; namespace WIDESEAWCS_Model.Models { - [SugarTable(nameof(Dt_StationManager), "浠诲姟淇℃伅")] + [SugarTable(nameof(Dt_StationManager), "绔欏彴淇℃伅")] public class Dt_StationManager : BaseEntity { /// <summary> @@ -38,7 +33,7 @@ public int stationID { get; set; } /// <summary> - /// 绔欏彴绫诲瀷 + /// 绔欏彴绫诲瀷 1-鍏ュ簱绔欏彴 2-鍑哄簱绔欏彴 3-寮傚父鎺掑嚭绔欏彴 4-NG宸ョ珯鏀炬枡 5-NG宸ョ珯鍙栨枡 6-绌烘鍏ュ簱 7-绌烘鍑哄簱 /// </summary> [ImporterHeader(Name = "绔欏彴绫诲瀷")] [ExporterHeader(DisplayName = "绔欏彴绫诲瀷")] @@ -100,5 +95,19 @@ [ExporterHeader(DisplayName = "MOM璁惧缂栧彿")] [SugarColumn(IsNullable = false, ColumnDescription = "MOM璁惧缂栧彿")] public string stationEquipMOM { get; set; } + + /// <summary> + /// + /// </summary> + [SugarColumn(IsNullable = false, ColumnDescription = "NG瀛愯澶囩紪鍙�")] + public string stationNGChildCode { get; set; } + + /// <summary> + /// + /// </summary> + [SugarColumn(IsNullable = false, ColumnDescription = "NG瀛愯澶囧潗鏍�")] + public string stationNGLocation { get; set; } + public string remark { get; set; } + } } -- Gitblit v1.9.3