Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -6300,11 +6300,11 @@ FROM
                             if (_EnterExitCosts.Visa > 0)
                             {
                                 //insidePayTotal += _EnterExitCosts.Visa;
-                                row1_1 = $"签证费： {_EnterExitCosts.Visa.ToString("#0.00")} 人民币/人";
-                                if (!string.IsNullOrEmpty(_EnterExitCosts.VisaRemark))
-                                {
-                                    row1_1 += $"\t签证费用描述: ： {_EnterExitCosts.VisaRemark} 人民币/人";
-                                }
+                                row1_1 = $"签证费：{_EnterExitCosts.Visa.ToString("#0.00")} 人民币/人";
+                                //if (!string.IsNullOrEmpty(_EnterExitCosts.VisaRemark))
+                                //{
+                                //    row1_1 += $"\t签证费用描述： {_EnterExitCosts.VisaRemark} 人民币/人";
+                                //}
                             }
 
                             string row1_2 = "";
@@ -6890,9 +6890,9 @@ FROM
                         dic.Add("CityTranffic", _EnterExitCosts.CityTranffic.ToString("#0.00"));
 
                         string otherFeeStr = "";
-                        if (_EnterExitCosts.Visa > 0) otherFeeStr += $"签证费： {_EnterExitCosts.Visa.ToString("#0.00")} 元，";
-                        if (_EnterExitCosts.Safe > 0) otherFeeStr += $"保险费： {_EnterExitCosts.Safe.ToString("#0.00")} 元，";
-                        if (_EnterExitCosts.Ticket > 0) otherFeeStr += $"参展门票费： {_EnterExitCosts.Ticket.ToString("#0.00")} 元，";
+                        if (_EnterExitCosts.Visa > 0) otherFeeStr += $"签证费：{_EnterExitCosts.Visa.ToString("#0.00")} 元，";
+                        if (_EnterExitCosts.Safe > 0) otherFeeStr += $"保险费：{_EnterExitCosts.Safe.ToString("#0.00")} 元，";
+                        if (_EnterExitCosts.Ticket > 0) otherFeeStr += $"参展门票费：{_EnterExitCosts.Ticket.ToString("#0.00")} 元，";
 
                         #region 其他款项费用 增加位置：模板第6项其他费用字符串追加
 
@@ -8415,11 +8415,11 @@ FROM
                             if (_EnterExitCosts.Visa > 0)
                             {
                                 //insidePayTotal += _EnterExitCosts.Visa;
-                                row1_1 = $"签证费： {_EnterExitCosts.Visa.ToString("#0.00")} 人民币/人";
-                                if (!string.IsNullOrEmpty(_EnterExitCosts.VisaRemark))
-                                {
-                                    row1_1 += $"\t签证费用描述: ： {_EnterExitCosts.VisaRemark} 人民币/人";
-                                }
+                                row1_1 = $"签证费：{_EnterExitCosts.Visa.ToString("#0.00")} 人民币/人";
+                                //if (!string.IsNullOrEmpty(_EnterExitCosts.VisaRemark))
+                                //{
+                                //    row1_1 += $"\t签证费用描述： {_EnterExitCosts.VisaRemark} 人民币/人";
+                                //}
                             }
 
                             string row1_2 = "";
@@ -8970,9 +8970,9 @@ FROM
                         dic.Add("CityTranffic", _EnterExitCosts.CityTranffic.ToString("#0.00"));
 
                         string otherFeeStr = "";
-                        if (_EnterExitCosts.Visa > 0) otherFeeStr += $"签证费： {_EnterExitCosts.Visa.ToString("#0.00")} 元，";
-                        if (_EnterExitCosts.Safe > 0) otherFeeStr += $"保险费： {_EnterExitCosts.Safe.ToString("#0.00")} 元，";
-                        if (_EnterExitCosts.Ticket > 0) otherFeeStr += $"参展门票费： {_EnterExitCosts.Ticket.ToString("#0.00")} 元，";
+                        if (_EnterExitCosts.Visa > 0) otherFeeStr += $"签证费：{_EnterExitCosts.Visa.ToString("#0.00")} 元，";
+                        if (_EnterExitCosts.Safe > 0) otherFeeStr += $"保险费：{_EnterExitCosts.Safe.ToString("#0.00")} 元，";
+                        if (_EnterExitCosts.Ticket > 0) otherFeeStr += $"参展门票费：{_EnterExitCosts.Ticket.ToString("#0.00")} 元，";
 
                         #region 其他款项费用 增加位置：模板第6项其他费用字符串追加
 

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -4188,10 +4188,10 @@ namespace OASystem.API.OAMethodLib
                         {
                             //insidePayTotal += enterExitCosts.Visa;
                             row1_1 = $"签证费： {enterExitCosts.Visa.ToString("#0.00")} 人民币/人";
-                            if (!string.IsNullOrEmpty(enterExitCosts.VisaRemark))
-                            {
-                                row1_1 += $"\t签证费用描述： {enterExitCosts.VisaRemark}";
-                            }
+                            //if (!string.IsNullOrEmpty(enterExitCosts.VisaRemark))
+                            //{
+                            //    row1_1 += $"\t签证费用描述： {enterExitCosts.VisaRemark}";
+                            //}
                         }
 
                         string row1_2 = "";

OASystem/OASystem.Domain/Entities/Customer/Crm_TableOperationRecord.cs

@@ -18,6 +18,7 @@ namespace OASystem.Domain.Entities.Customer
         /// "Crm_NewClientData" 客户资料表
         /// "Login" 登录
         /// "InforRetrogressTable"  会务倒退表
+        /// "FileDownload"
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string? TableName { get; set; }