Merge remote-tracking branch 'origin/master'

admin

2019-04-22 9670389ca9d2646f17e99c20ae04b1adae64511b

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

@@ -92,7 +92,7 @@
    * @param page

    * @return

    */

   public int getCount(String key, int page);

   public int getCount(String key);



   public Config getConfig(long id);