Merge branch 'dev_1'

yujian

2019-05-14 236b8cd939e9c161d5410f530f9539df7ebba484

 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsClassService.java

@@ -79,7 +79,7 @@
    * @return

    * @throws Exception

    */

   public List<Map<String, Object>> getClassListAllCache() throws Exception;

   public List<Map<String, Object>> getClassListAllCache(boolean changePicture) throws Exception;





   /**