Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 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;