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/vo/MgtOrderDetailVo.java

@@ -44,6 +44,9 @@
    @ApiModelProperty(value="订单编号")
    private String orderNo;

    @ApiModelProperty(value="支付流水号")
    private String outTradeNo;

    @ApiModelProperty(value="订单来源1.商城2.秒杀活动3.线下创建")
    private String orderFrom;