Merge remote-tracking branch 'origin/master'

Administrator

2018-11-20 819aadbd94cbc159746b8c4c18aade8e52d438ff

 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);

}