Merge remote-tracking branch 'origin/test' into test

manailin

2021-07-08 7eedb5a250515610f1df1fa0730cf779f0525add

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