Merge branch 'order-update' into dev

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/mysql/customerContacts/CustomerContactsMapper.java

@@ -68,6 +68,8 @@ public interface CustomerContactsMapper extends BaseMapperX<CustomerContactsDO>
             "c.id as customer_id, ",
             "c.name as customer_name, ",
             "c.name_en as customer_name_en, ",
+            "c.default_pay as default_pay, ",
+            "c.no_consignee as no_consignee, ",
             "cc.* , ",
             "cc.id as customer_contacts_id, ",
             "cc.name as contacts_name, ",
@@ -108,6 +110,8 @@ public interface CustomerContactsMapper extends BaseMapperX<CustomerContactsDO>
             "c.id as customer_id, ",
             "c.name as customer_name, ",
             "c.name_en as customer_name_en, ",
+            "c.default_pay as default_pay, ",
+            "c.no_consignee as no_consignee, ",
             "cc.* , ",
             "cc.id as customer_contacts_id, ",
             "cc.name as contacts_name, ",

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dto/CustomerContactsDto.java

@@ -84,5 +84,12 @@ public class CustomerContactsDto {
     private Boolean isInOpenSea;
 
 
+    @ApiModelProperty(value = "控货无收货人,1-是，0-否")
+    private Boolean noConsignee;
+
+    @ApiModelProperty(value = "默认付款，1-是，0-否")
+    private Boolean defaultPay;
+
+
 
 }