Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-31 23e78efefd96d28f0c492348f3cb8a9e6cdcbbab

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java

@@ -61,7 +61,7 @@
    @ApiModelProperty(value = "支付合计")
    private BigDecimal totalAmount;

    @ApiModelProperty(value = "订单状态 1=待发货 2=待收货 3=已完成 4=已取消")
    @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消")
    private OrderStatusEnum orderStatus;

    @ApiModelProperty(value = "支付时间")