Merge remote-tracking branch 'origin/master'

admin

2019-01-28 f7ed4e6bbe9be95d268481e66d70d90e70e07e12

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

}