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

Helius

2022-06-17 c456a6adeaf414f74cb2ef1e3c786285804e0e5c

 src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java

@@ -62,6 +62,22 @@
     */
    private Integer delFlag;

    /**
     * 确认收货时间
     */
    private Date receivingTime;

    @TableField(exist = false)
    private List<MallOrderItem> items;

    private String payImage;

    private String payTradeNo;

    /**
     * 订单类型 1-普通订单 2-积分订单
     */
    private Integer orderType;

    private BigDecimal carriage;
}