Merge branch 'master' into txb

tangxiaobao

2021-08-16 a7dc5d2d03deacb8c7c0028a46aba2f141f35649

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