Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

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

@@ -12,10 +12,10 @@

    /* 订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=保证金 5=拍卖订单*/

    COMMODITY_ORDER(1, "商品订单"),
    SNAP_ORDERS(2, "秒杀订单"),
    GROUP_PURCHASE_ORDERS(3, "团购订单"),
    AUCTION_ORDERS(4, "拍卖订单");
    COMMODITY_ORDER(1, "商品"),
    SNAP_ORDERS(2, "秒杀"),
    GROUP_PURCHASE_ORDERS(3, "团购"),
    AUCTION_ORDERS(4, "拍卖");
    @EnumValue
    private final int code;
    @JsonValue