Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-18 0e7584f11e1da29ce07f5f21048197dd155f1574

 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;
}