From e97b9982b7d09890655cdd855d66c388a95e7df5 Mon Sep 17 00:00:00 2001
From: zhangxiaofeng <1939543722@qq.com>
Date: Wed, 10 Apr 2024 15:10:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=BA=E7=AB=99=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E5=BC=95=E5=85=A5=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/BookingOrder/BookingOrderService.cs             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index ba754bd1..638229be 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -9251,7 +9251,11 @@ namespace Myshipping.Application
                 }
 
                 // 赋值联系人信息
-                item.contact_tel = !string.IsNullOrEmpty(contact?.contact_tel1) ? contact?.contact_tel1 : contact?.contact_tel2;
+                item.contact_tel = contact?.contact_tel1;
+                if (!string.IsNullOrWhiteSpace(contact?.contact_tel2))
+                {
+                    item.contact_tel += (" " + contact.contact_tel2);
+                }
                 item.contact_name = contact?.contact_name;
                 item.contact_email = contact?.contact_email;
             }

From f9ca126f1528f92198e5ed35a43e0dbb8cbe78fa Mon Sep 17 00:00:00 2001
From: wanghaomei <86whm@163.com>
Date: Wed, 10 Apr 2024 16:26:49 +0800
Subject: [PATCH 2/2] get->post

---
 .../Service/DjyTenantParam/DjyTenantParamService.cs           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Myshipping.Core/Service/DjyTenantParam/DjyTenantParamService.cs b/Myshipping.Core/Service/DjyTenantParam/DjyTenantParamService.cs
index 52e3e68e..3eeedd48 100644
--- a/Myshipping.Core/Service/DjyTenantParam/DjyTenantParamService.cs
+++ b/Myshipping.Core/Service/DjyTenantParam/DjyTenantParamService.cs
@@ -138,7 +138,7 @@ namespace Myshipping.Core.Service
         /// 分页获取租户参数类别
         /// </summary>
         /// <returns></returns>
-        [HttpGet("/DJYTenantParam/page")]
+        [HttpPost("/DJYTenantParam/page")]
         public async Task<SqlSugarPagedList<DJYTenantParamOutput>> Page(QueryDJYTenantParamInput input)
         {
             var list = await _rep.AsQueryable()
@@ -277,7 +277,7 @@ namespace Myshipping.Core.Service
         /// 分页获取参数值
         /// </summary>
         /// <returns></returns>
-        [HttpGet("/DJYTenantParam/PageParamValue")]
+        [HttpPost("/DJYTenantParam/PageParamValue")]
         public async Task<SqlSugarPagedList<DjyTenantParamValueListOutput>> PageParamValue(QueryTenantParamValueInput input)
         {
             var list = await _valuerep.AsQueryable().Filter(null, true)