From a102ce1da96b188ffecf3729d12b5cfa30e01b99 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期三, 30 七月 2025 10:48:08 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/FZCZTB

---
 Admin.NET/FZCZTB.NET.MD/CutomerMd/Extend/FBS_CusExtend.cs |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/Admin.NET/FZCZTB.NET.MD/CutomerMd/Extend/FBS_CusExtend.cs b/Admin.NET/FZCZTB.NET.MD/CutomerMd/Extend/FBS_CusExtend.cs
index 692e6a3..6265897 100644
--- a/Admin.NET/FZCZTB.NET.MD/CutomerMd/Extend/FBS_CusExtend.cs
+++ b/Admin.NET/FZCZTB.NET.MD/CutomerMd/Extend/FBS_CusExtend.cs
@@ -8,6 +8,7 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -26,7 +27,7 @@
     /// </summary>
     [SugarColumn(ColumnDescription = "鐢ㄦ埛ID" )]
     [Required(ErrorMessage = "鐢ㄦ埛ID 蹇呭～")]
-    public int CustomerId { get; set; }
+    public long  CustomerId { get; set; }
 
 
   
@@ -44,6 +45,12 @@
     [Required(ErrorMessage = "浜ゆ槗涓讳綋浠ｇ爜涓哄繀濉」")]
     [SugarColumn(ColumnDescription = "浜ゆ槗涓讳綋code")]
     public string TransactionCode { get; set; }
+
+    /// <summary>
+    /// 浜ゆ槗涓讳綋
+    /// </summary>
+    [Navigate(NavigateType.OneToOne, nameof(TransactionCode),nameof(FBS_ExRole.Code))]
+    public FBS_ExRole? TransactionRole { get; set; }
     /// <summary>
     /// 钀ヤ笟鎵х収鏂囦欢璺緞
     /// </summary>
@@ -70,7 +77,15 @@
     /// </summary>
     [Required(ErrorMessage = "娉ㄥ唽璧勯噾涓哄繀濉」")]
     [SugarColumn(ColumnDescription = "娉ㄥ唽璧勯噾")]
-    public decimal RegisteredCapital { get; set; }
+    public string RegisteredCapital { get; set; }
+
+
+    ///// <summary>
+    ///// 娉ㄥ唽璧勯噾锛堝崟浣嶏細涓囧厓 锛�
+    ///// </summary>
+    //[Required(ErrorMessage = "娉ㄥ唽璧勯噾涓哄繀濉」")]
+    //[SugarColumn(ColumnDescription = "娉ㄥ唽璧勯噾")]
+    //public decimal RegisteredCapital { get; set; }
 
     /// <summary>
     /// 娉曞畾浠ｈ〃浜哄鍚�
@@ -90,15 +105,15 @@
     /// 娉曞畾浠ｈ〃浜鸿韩浠借瘉鍙风爜
     /// </summary>
     [Required(ErrorMessage = "娉曞畾浠ｈ〃浜鸿韩浠借瘉鍙风爜涓哄繀濉」")]
-    [SugarColumn(ColumnDescription = "娉曞畾浠ｈ〃浜哄鍚�")]
+    [SugarColumn(ColumnDescription = "娉曞畾浠ｈ〃浜鸿韩浠借瘉鍙风爜")]
     public string LegalRepresentativeIdNumber { get; set; }
 
     /// <summary>
     /// 娉曞畾浠ｈ〃浜鸿仈绯荤數璇�
     /// </summary>
     [Required(ErrorMessage = "娉曞畾浠ｈ〃浜鸿仈绯荤數璇濅负蹇呭～椤�")]
-    [Phone(ErrorMessage = "鑱旂郴鐢佃瘽鏍煎紡涓嶆纭�")]
-    [SugarColumn(ColumnDescription = "娉曞畾浠ｈ〃浜哄鍚�")]
+    [Phone(ErrorMessage = "娉曞畾浠ｈ〃浜鸿仈绯荤數璇濅笉姝ｇ‘")]
+    [SugarColumn(ColumnDescription = "娉曞畾浠ｈ〃浜鸿仈绯荤數璇�")]
     public string LegalRepresentativePhone { get; set; }
 
     /// <summary>
@@ -127,7 +142,7 @@
     /// 浼佷笟涓昏惀涓氬姟
     /// </summary>
     [Required(ErrorMessage = "涓昏惀涓氬姟涓哄繀濉」")]
-    [SugarColumn(ColumnDescription = "浼佷笟涓昏惀涓氬姟")]
+    [SugarColumn(ColumnDescription = "浼佷笟涓昏惀涓氬姟",Length =Int32.MaxValue,IsNullable = true)]
     public string MainBusiness { get; set; }
 
     /// <summary>
@@ -185,5 +200,36 @@
     /// </summary>
 
     [SugarColumn(ColumnDescription = "瀹℃牳姝ラ")]
-    public int steps { set; get; } = 0;
+    public CusExtendStep steps { set; get; } = CusExtendStep.UNExamine;
 }
+
+/// <summary>
+/// 瑙掕壊璧勬枡瀹℃牳杩涘害
+/// </summary>
+public enum CusExtendStep
+{
+    /// <summary>
+    /// 鏈鏍�
+    /// </summary>
+    [Description("鏈鏍�")]
+    UNExamine =0,
+    /// <summary>
+    /// 鏇存敼
+    /// </summary>
+    [Description("鏇存敼")]
+    Change,
+
+    /// <summary>
+    /// 閫氳繃
+    /// </summary>
+    [Description("閫氳繃")]
+    Pass,
+    /// <summary>
+    /// 鏈�氳繃
+    /// </summary>
+    [Description("鏈�氳繃")]  
+    UnPass
+
+    
+
+}
\ No newline at end of file

--
Gitblit v1.9.1