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

xiaoyong931011

2022-06-27 f03a1d7b68997648b15cc6122ce68da9a2e4f672

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

@@ -37,4 +37,9 @@
    private BigDecimal costPrice;

    private Integer isNormal;

    /**
     * 是否结清
     */
    private Integer hasSettle;
}