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/AdminMallOrderInfoVo.java

@@ -70,7 +70,9 @@

    private String memberEmail;

    private Integer carriage;
    private BigDecimal carriage;

    private BigDecimal goodsAmount;
    //配送方式 1：自提 2：快递
    private Integer deliveryType;

@@ -83,4 +85,6 @@
    private String leaderName;
    //商品名称
    private String goodsName;

    private String refererName;
}