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

huanghongfa

2021-07-30 c7450a8e1724528046af3683d49eaf0a06785130

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java

@@ -149,9 +149,15 @@
    @ApiModelProperty(value = "参加活动奖励金额")
    private BigDecimal activityAmount;

    @ApiModelProperty(value = "活动奖励金额")
    private BigDecimal activityMoney;

    @ApiModelProperty(value = "随手拍活动id")
    private Long activityId;

    @ApiModelProperty(value = "类型（1.心情类 2.治理类）")
    private Integer easyType;

    @ApiModelProperty(value = "随手拍活动")
    private ComActEasyPhotoActivityVO easyPhotoActivityVO;
}