Merge branch '_dev_yh' into dev

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customerDetail/CustomerOfferBackVo.java

@@ -14,6 +14,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ApiModel("管理后台 - 客户基本信息客户报价 Response VO")
 @Data
 public class CustomerOfferBackVo {
+    @ApiModelProperty(value = "报价单ID")
+    private String offerId;
+
     @ApiModelProperty(value = "报价单号")
     private String number;
 

yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/CustomerDetailMapper.xml

@@ -13,7 +13,7 @@
     </select>
     <select id="selectCustomerOfferPage"
             resultType="cn.iocoder.yudao.module.customer.vo.customerDetail.CustomerOfferBackVo">
-        select t.number    as number,
+        select t.offer_id, t.number    as number,
                t.order_no  as order_no,
                s.title_zh  as objective_name,
                s.title_en  as objective_name_en,

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackPageVO.java

@@ -325,9 +325,11 @@ public class OrderBackPageVO {
     private Date inTime;
 
     @ApiModelProperty(value = "已装柜时间/到仓时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private Date loadTime;
 
-    @ApiModelProperty(value = "已卸柜/已到仓时间")
+    @ApiModelProperty(value = "已卸柜/出仓时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private Date unloadTime;

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/order/OrderController.http

@@ -74,7 +74,7 @@ tenant-id: {{adminTenentId}}
 
 
 ### 查询前20条
-GET {{baseUrl}}/ecw/order/customer-order-page?page=2&customerDetailId=12925
+GET {{baseUrl}}/ecw/order/customer-order-page?customerDetailId=41694&rows=10&page=1&pageNo=1&destCountryId%5B0%5D=4174&destCountryId%5B1%5D=4175&objectiveId%5B0%5D=4181&objectiveId%5B1%5D=4184&destWarehouseId%5B0%5D=2&destWarehouseId%5B1%5D=4&destWarehouseId%5B2%5D=6
 Authorization: Bearer {{token}}
 tenant-id: {{adminTenentId}}