Merge branch 'test' into 'master'

罗元桥

2021-07-24 cbf825f4e63e77241a11ec90841637991e43940f

 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;