Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

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

@@ -1,11 +1,10 @@
package com.panzhihua.common.model.dtos.community.easyPhoto;

import java.math.BigDecimal;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

@Data
@ApiModel("编辑随手拍活动请求参数")
@@ -32,6 +31,9 @@
    @ApiModelProperty("普通奖励金额")
    private BigDecimal ordinaryReward;

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

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