Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 893c8ad4d5d55f35c8499c007ce028bc43c6bf9f

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java

@@ -12,7 +12,7 @@
public class GoodsVO {

    @ApiModelProperty(value = "商品id")
    private Long goodsId;
    private Integer goodsId;

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