Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

yanghui

2022-12-08 5e7892cd0921111dfbaf84196f2593f8045d1c11

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

@@ -64,4 +64,10 @@
    @ApiModelProperty(value = "自提点信息")
    private ConvenientElevatingPointVO convenientElevatingPointVO;

    @ApiModelProperty(value = "物流单号")
    private String logisticsNo;

    @ApiModelProperty(value = "物流公司")
    private String logisticsCompany;

}