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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

 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;