Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerIntegralMerchant.java

@@ -81,4 +81,24 @@
    private String content;


    @ApiModelProperty(value = "0 社区商品    1 商家商品")
    private String goodType;

    @ApiModelProperty(value = "商家id")
    private String merchantId;


    /**
     * 商品数量
     */
    @ApiModelProperty(value = "商品数量")
    private String goodNum;


    /**
     * 商品数量
     */
    @ApiModelProperty(value = "商品图片")
    private String goodImgs;

}