Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-25 6c6c0825e59377261b9972af95e1e4dafb43fcfd

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

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.shop;

import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -58,5 +59,9 @@

    @ApiModelProperty(value = "收货人详细地址")
    private String detailAddress;
    @ApiModelProperty(value = "自提点id")
    private Long pointId;
    @ApiModelProperty(value = "自提点信息")
    private ConvenientElevatingPointVO convenientElevatingPointVO;

}