Merge branch 'test' into 'master'

罗元桥

2021-07-26 021354080a0cc677e1483c7fd44dd6d6487c0321

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

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

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

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