Merge remote-tracking branch 'origin/master'

admin

2019-04-12 45f35a348c6d19f954888bf3e595bdf9d6016bb8

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