Merge branch 'master' into dev-moneydetail

admin

2018-12-19 d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6

 fanli/src/main/java/com/yeshi/fanli/service/inter/config/InviteGetMoneyService.java

@@ -75,4 +75,8 @@
    * @param key

    */

   void editActivityRules(String value, String key);



   List<SpreadImg> listQuery(int start, int pageSize, String key);



   long countQuery(String key);

}