Merge branch 'master' into 'test'

罗元桥

2021-07-31 3d88bf929fc637a898ea0ca3e64cd6c1ec26a182

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralRuleServiceImpl.java

@@ -79,7 +79,7 @@
        integralRuleWXYDO.setIsRestrict(1);
        integralRuleWXYDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleWXYDO.setCount(5);
        integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbssp);
        integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbwxy);
        integralRuleList.add(integralRuleWXYDO);

        //议事投票默认积分规则