From 310b5cd57d8159499558d1ddda845238beae4c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Thu, 31 Aug 2023 08:56:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs                  | 9 ++++-----
 .../Entities/BQ/HBPO_CAN_SA_SERVICE.cs                   | 6 ------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs
index 40af1fa0..7cb2156e 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs
@@ -70,7 +70,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public string IsReturn { get; set; }
 
         [ExporterHeader(DisplayName = "合同号")]
-        public int ContractDocID { set; get; }
+        public string ContractDocID { set; get; }
 
 
         /// <summary>
@@ -90,10 +90,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// 金额
         /// </summary>
         public decimal Amt { get; set; }
-        /// <summary>
-        /// 合同号
-        /// </summary>
-        public string ContractDocID { set; get; }
+   
    
 
     }
@@ -135,6 +132,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// </summary>
         [ExporterHeader(DisplayName = "版本号")]
         public int Version { get; set; }
+        [ExporterHeader(DisplayName = "合同号")]
+        public int ContractDocID { set; get; }
 
     }
     //public class BBAC_CAN_SA_EXP_DTO
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
index 2c1146fb..4fa5467e 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
@@ -163,11 +163,5 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             return  new JsonResult(new { Code = 200, Message = "生成成功" });
         }
-
-
-       
-
-
-
     }
 }