Merge branch 'master' into div1

yujian

2019-01-10 391f2e33973b93b0aee53ca93affb1c92eb9a9d7

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

}