Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-18 d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerGoodsDTO.java

@@ -33,4 +33,7 @@

    @ApiModelProperty(hidden = true)
    private Long userId;

    @ApiModelProperty("商品分类id")
    private Long categoriesId;
}