Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 c9d5426b2055fdd576c750098bea530d588f0ea9

 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 String id;

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