Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka

xiaoyong931011

2023-09-19 36f760b1a039da26060c5ab2807a9c6a73f76b43

 src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java

@@ -46,6 +46,12 @@
    @ApiModelProperty(value = "提货码")
    private String takeCode;

    @ApiModelProperty(value = "提货人姓名")
    private String name;

    @ApiModelProperty(value = "提货人电话")
    private String phone;

    @ApiModelProperty(value = "配送状态 1：待配送 2：配送中 3：已送达")
    private Integer deliveryState;