Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2025-06-18 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/PageShopMgtGoodsVO.java

@@ -24,6 +24,9 @@
    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "商品绑定门店id")
    private String bindShopId;

    @Excel(name = "商品名称", width = 30, sort = 3)
    @ApiModelProperty(value = "商品名称")
    private String goodsName;