Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 a611bfdeb9036d32c3877d43a0dca75bac93ebe4

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java

@@ -27,6 +27,13 @@
    @ApiModelProperty(value = "商户id")
    private Long storeId;

    @ApiModelProperty(value = "配送单id")
    private Long deliveryId;

    @ApiModelProperty(value = "配送方式（1.自提 2.快递）")
    private Integer deliveryType;


    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;
}