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

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -141,6 +141,10 @@
     * 活动奖励金额
     */
    private BigDecimal activityAmount;
    /**
     * 完成人id
     */
    private Long completeId;

    /**
     * 参加活动标签（1.优质 2.精良 3.普通 4.一般）