Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-06 84caf250d5638279d45f32af13ddd346bed2e0a4

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

@@ -10,7 +10,7 @@
@Data
public class OrderVO {
    @ApiModelProperty(value = "订单id")
    private Integer id;
    private Long id;

    @ApiModelProperty(value = "订单编号")
    private String orderNumber;