Merge branch 'test' into 'master'

罗元桥

2021-07-12 0dc0a47cf5f655cb0dbff082f7c36613c21e328b

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

@@ -141,4 +141,23 @@
     * 活动奖励金额
     */
    private BigDecimal activityAmount;

    /**
     * 参加活动标签（1.优质 2.精良 3.普通）
     */
    public interface activityType{
        int yz = 1;
        int jl = 2;
        int pt = 3;
    }

    /**
     * 状态 1待审核   2进行中 3已驳回 4已完成
     */
    public interface status{
        int dsh = 1;
        int dfk = 2;
        int ybh = 3;
        int ywc = 4;
    }
}