Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2025-07-04 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtShopOrderPageDto.java

@@ -17,6 +17,9 @@
    @ApiModelProperty(value = "关键词")
    private String keyword;

    @ApiModelProperty(value = "订单来源")
    private Integer orderFrom;

    @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
    private Integer orderStatus;