合并代码

puzhibing

2024-12-10 5f9e42d921ba2b191199e61cf070da20de39758c

 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;