Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

tangxiaobao

2022-04-14 87f6cce44f87f9df74ef737ea831bed9ceed490c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditOrderAddressDto.java

@@ -30,6 +30,9 @@
    @ApiModelProperty(value = "收货地区")
    private String receivingRegion;

    @ApiModelProperty(value = "收货地区Code")
    private String receivingRegionCode;

    @ApiModelProperty(value = "收货详细地址")
    private String receivingAddress;