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

无关风月

2025-08-26 960380f89c9371ba309d6c50b1ab1b677ea74575

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderManagePageListVO.java

@@ -14,6 +14,8 @@
public class OrderManagePageListVO {
    @ApiModelProperty("订单id")
    private Long id;
    @ApiModelProperty("订单idStr")
    private String idStr;
    @ApiModelProperty("订单编号")
    @Excel(name = "订单编号")
    private String orderNumber;