Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -9265,7 +9265,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;
             }

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)