Merge branch 'test' into 'master'

罗元桥

2021-08-11 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActIntegralRuleMapper.java

@@ -34,4 +34,10 @@
     */
    IPage<ComActIntegralUserRuleAdminVO> getIntegralRuleAdminList(Page page, @Param("integralRuleDTO") PageComActIntegralRuleDTO integralRuleDTO);

    /**
     * 查询默认启动的积分规则列表
     * @return  默认积分规则列表
     */
    List<ComActIntegralRuleDO> getIntegralDefaultList();

}