Merge remote-tracking branch 'origin/master'

mitao

2024-06-13 464254ba0e542c22fac68c7512f06a9a8df34b28

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java

@@ -15,7 +15,8 @@
    TO_BE_SHIPPED(2, "待发货"),
    GOODS_TO_BE_RECEIVED(3, "待收货"),
    FINISHED(4, "已完成"),
    CANCELED(5, "已取消");
    CANCELED(5, "已取消"),
    AFTER_SALE(6, "售后");

    @EnumValue
    private final int code;