Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 457b40e054a68d0dc5b5fc755cdf468e5d37ab28

 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;