Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 9b1acfe1b5786a3a3e3e849a5729d68fa05c3a1a

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopUserAddressVO.java

@@ -4,8 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @auther lyq
 * @create 2021-04-14 15:02:14
@@ -82,7 +80,7 @@
    private String detailAddress;

    /**
     * 是否是默认地址(1.是  2.否)
     * 是否是默认地址(1.是 2.否)
     */
    @ApiModelProperty("是否是默认地址(1.是  2.否)")
    private Integer isDefault;