Merge branch 'test' into 'master'

罗元桥

2021-08-05 cc1098fc00a50cb1591d182f04bc37066ff0a9e2

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

@@ -74,6 +74,11 @@
    private BigDecimal ordinaryReward;

    /**
     * 一般奖励金额
     */
    private BigDecimal commonlyReward;

    /**
     * 随手拍数量
     */
    private Integer count;