Merge branch 'test' into 'master'

罗元桥

2021-07-12 0dc0a47cf5f655cb0dbff082f7c36613c21e328b

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

@@ -148,4 +148,7 @@

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

    @ApiModelProperty(value = "类型（1.心情类 2.治理类）")
    private Integer easyType;
}