Merge branch 'test' into 'master'

罗元桥

2021-08-05 37018ce6810f4855f43374f47cbd7b5e0d70d5a5

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