新增字段定义错误修复

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/order/OrderDO.java

@@ -409,8 +409,17 @@ public class OrderDO extends BaseDO {
     @ApiModelProperty(value = "收货方式：1 自提 2 送货上门 ")
     private Integer harvestMethod;
 
-    @ApiModelProperty(value = "送货地址 ")
-    private String address;
+    @ApiModelProperty(value = "收货地址的国家")
+    private Long country;
+
+    @ApiModelProperty(value = "收货地址的省")
+    private Long province;
+
+    @ApiModelProperty(value = "收货地址的市")
+    private Long city;
+
+    @ApiModelProperty(value = "收货地址")
+    private String consigneeAddress;
     /**
      * 入仓时间
      */

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

@@ -341,12 +341,6 @@ public class OrderBackVO {
     @ExcelProperty("送货时间")
     private Date deliveryDate;
 
-    @ApiModelProperty(value = "收货方式：1 自提 2 送货上门 ")
-    private Integer harvestMethod;
-
-    @ApiModelProperty(value = "收货地址")
-    private String consigneeAddress;
-
     @ExcelProperty("入仓时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "入仓时间")
@@ -419,6 +413,9 @@ public class OrderBackVO {
     @ApiModelProperty(value = "发货人信息")
     private OrderConsignorBackVO consignorVO;
 
+    @ApiModelProperty(value = "收货方式：1 自提 2 送货上门 ")
+    private Integer harvestMethod;
+
     @ApiModelProperty(value = "收货地址的国家")
     private Long country;
 
@@ -428,6 +425,10 @@ public class OrderBackVO {
     @ApiModelProperty(value = "收货地址的市")
     private Long city;
 
+    @ApiModelProperty(value = "收货地址")
+    private String consigneeAddress;
+
+
     @ApiModelProperty(value = "收货客户id", required = true)
     @NotNull(message = "收货客户id不能为空")
     private Long consigneeId;