Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-04 79e82d188a24ad92395ac4b39c1a49266a647c3f

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderGoodsVO.java

File was renamed from ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderGoodsVO.java
@@ -10,7 +10,7 @@
@ApiModel(value = "订单商品")
public class OrderGoodsVO {
    @ApiModelProperty(value = "商品id")
    private Long goodsId;
    private Integer goodsId;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;