代码冲突修复，并补充收货地址的国家、省、市数据冗余到主订单表

sql/v2.1/20240909.sql

 -- 当订单无收货人时，收货方式无法保存的bug修复
 alter table `ecw_order`
     add column `harvest_method` tinyint DEFAULT '1' COMMENT '收货方式：1 自提 2 送货上门';
+alter table `ecw_order`
+    add column `city` bigint DEFAULT NULL COMMENT '收货地址市';
+alter table `ecw_order`
+    add column `province` bigint DEFAULT NULL COMMENT '收货地址省';
+alter table `ecw_order`
+    add column `country` bigint DEFAULT NULL COMMENT '收货地址国家';
 alter table `ecw_order`
     add column `consignee_address` varchar(255) DEFAULT '' COMMENT '收货地址';
 

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

@@ -428,9 +428,6 @@ public class OrderBackVO {
     @ApiModelProperty(value = "收货地址的市")
     private Long city;
 
-    @ApiModelProperty(value = "收货地址")
-    private String consigneeAddress;
-
     @ApiModelProperty(value = "收货客户id", required = true)
     @NotNull(message = "收货客户id不能为空")
     private Long consigneeId;
@@ -442,9 +439,6 @@ public class OrderBackVO {
     @ApiModelProperty(value = "收货人信息")
     private OrderConsigneeBackVO consigneeVO;
 
-    @ApiModelProperty(value = "收获方式：1 自提 2 送货上门 ")
-    private Integer harvestMethod;
-
     @ApiModelProperty(value = "始发地id")
     private Long departureId;
 

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

@@ -285,6 +285,15 @@ public class OrderBaseVO {
     @ApiModelProperty(value = "收货方式：1 自提 2 送货上门 ")
     private Integer harvestMethod;
 
+    @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/OrderCreateReqVO.java

@@ -71,15 +71,6 @@ public class OrderCreateReqVO extends OrderBaseVO {
     @ApiModelProperty(value = "收货客户联系人id")
     private Long consigneeContactsId;
 
-    @ApiModelProperty(value = "国家")
-    private Long country;
-
-    @ApiModelProperty(value = "省")
-    private Long province;
-
-    @ApiModelProperty(value = "市")
-    private Long city;
-
     @ApiModelProperty(value = "自定义付款人清单(name 详见字典 自定义付款人(custom_drawee), value 1 发货人 2 收货人)")
     private List<CustomDraweeVO> customDraweeVOList;
     

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

@@ -107,15 +107,6 @@ public class OrderUpdateReqVO extends OrderBaseVO {
     @ApiModelProperty(value = "收货人电话国家区号")
     private String countryCode;
 
-    @ApiModelProperty(value = "国家")
-    private Long country;
-
-    @ApiModelProperty(value = "省")
-    private Long province;
-
-    @ApiModelProperty(value = "市")
-    private Long city;
-
     @ApiModelProperty(value = "抄送人(id逗号拼接)")
     private String ccIds;