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

huanghongfa

2021-07-26 4da8d6c1e9d37606f15dca9fb552890724db4628

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoActivityDTO.java

@@ -34,6 +34,9 @@
    @ApiModelProperty("普通奖励金额")
    private BigDecimal ordinaryReward;

    @ApiModelProperty("一般奖励金额")
    private BigDecimal commonlyReward;

    @ApiModelProperty("活动图片")
    private String logo;
}