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

xiaoyong931011

2021-09-24 0fe5ec11aa84637be245d5f4838f8fbef7ff29cb

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

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

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

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