Merge branch 'test' into 'master'

罗元桥

2021-06-29 cd7bec2448443f88eee6f73df68df829fc95eed9

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

@@ -9,6 +9,7 @@

import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@@ -141,4 +142,10 @@

    @ApiModelProperty(value = "发生地址经纬度信息，逗号分割(长的在前面，短的在后面)")
    private String lngLat;

    @ApiModelProperty(value = "随手拍标签（1.优质 2.精良 3.普通）")
    private Integer activityType;

    @ApiModelProperty(value = "参加活动奖励金额")
    private BigDecimal activityAmount;
}