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

lidongdong

2023-08-23 ed35e27fd377db24fd5ff83848824f6525f1382c

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

@@ -30,6 +30,10 @@
    @ApiModelProperty(value = "配送单id")
    private Long deliveryId;

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


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