Merge branch 'div_12'

yujian

2019-05-14 ad9fbd2c18f280ef9bba47f28353d367cf2d94e8

 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;





   /**