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

xiaoyong931011

2022-09-22 7cf7a80569d3cb907e0260abc3b2dbd36ec6c4c2

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

@@ -42,4 +42,6 @@
     * 是否结清
     */
    private Integer hasSettle;
    //1:正常 2：退款中3：已退
    private Integer state;
}