From 532be1ac2776683b4910d9db0400cf88723bd656 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 30 十月 2024 20:20:56 +0800
Subject: [PATCH] 111
---
MES.Service/Modes/SysOrganization.cs | 67 ++++++++++++++++-----------------
MES.Service/service/BasicData/OrganizeManager.cs | 2
2 files changed, 33 insertions(+), 36 deletions(-)
diff --git a/MES.Service/Modes/SysOrganization.cs b/MES.Service/Modes/SysOrganization.cs
index c67a3d1..969575b 100644
--- a/MES.Service/Modes/SysOrganization.cs
+++ b/MES.Service/Modes/SysOrganization.cs
@@ -8,84 +8,81 @@
public class SysOrganization
{
/// <summary>
- /// 涓婚敭
- /// </summary>
+ /// 涓婚敭
+ ///</summary>
[SugarColumn(ColumnName = "GUID", IsPrimaryKey = true)]
- public Guid Guid { get; set; }
+ public Guid? Guid { get; set; }
/// <summary>
- /// 鐖剁骇guid
- /// </summary>
- [SugarColumn(ColumnName = "UP_GUID")]
- public Guid? UpGuid { get; set; }
-
- /// <summary>
- /// 鍚嶇О
- /// </summary>
+ /// 鍚嶇О
+ ///</summary>
[SugarColumn(ColumnName = "NAME")]
public string? Name { get; set; }
/// <summary>
- /// 鑱旂郴浜�
- /// </summary>
+ /// 鑱旂郴浜�
+ ///</summary>
[SugarColumn(ColumnName = "CON_PEOPLE")]
public string? ConPeople { get; set; }
/// <summary>
- /// 鑱旂郴鐢佃瘽
- /// </summary>
+ /// 鑱旂郴鐢佃瘽
+ ///</summary>
[SugarColumn(ColumnName = "CON_TEL")]
public string? ConTel { get; set; }
/// <summary>
- /// 绯荤粺鍐呯疆
- /// </summary>
+ /// 绯荤粺鍐呯疆
+ ///</summary>
[SugarColumn(ColumnName = "IS_SYS")]
public int? IsSys { get; set; }
/// <summary>
- /// 鐘舵��
- /// </summary>
+ /// 鐘舵��
+ ///</summary>
[SugarColumn(ColumnName = "IS_STATUS")]
public bool? IsStatus { get; set; }
/// <summary>
- /// 宸ュ巶缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string Factory { get; set; }
-
- /// <summary>
- /// 缂栬緫鏃堕棿
- /// </summary>
+ /// 缂栬緫鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "EDT_TIME")]
public DateTime? EdtTime { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "check_date")]
public DateTime? CheckDate { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "check_by")]
public string? CheckBy { get; set; }
/// <summary>
- /// 榛樿鍊�: ((0))
- /// </summary>
+ ///
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "check_status")]
public bool? CheckStatus { get; set; }
/// <summary>
- /// 缁勭粐ID
- /// </summary>
+ /// 缁勭粐ID
+ ///</summary>
+ [SugarColumn(ColumnName = "FID")]
+ public string? Fid { get; set; }
+
+ /// <summary>
+ /// 缁勭粐缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "FNumber")]
public string? FNumber { get; set; }
/// <summary>
- /// 鐖剁骇ID
- /// </summary>
+ /// 鐖剁骇ID
+ ///</summary>
[SugarColumn(ColumnName = "FParentlD")]
public string? FParentlD { get; set; }
diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
index 58cfacc..c674c29 100644
--- a/MES.Service/service/BasicData/OrganizeManager.cs
+++ b/MES.Service/service/BasicData/OrganizeManager.cs
@@ -119,7 +119,7 @@
FNumber = organize.FNumber,
FParentlD = organize.FParentID,
IsStatus = organize.FForbidStatus.Equals("A"),
- Factory = organize.Id,
+ Fid = organize.Id,
};
}
--
Gitblit v1.9.3