Merge branch 'master-new' into div

yujian

2019-06-24 4c68642aad8889ff599af52d33453c483f13092a

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java

@@ -309,7 +309,7 @@


   @Override

   @Cacheable(value = "classCache", key = "'getEffectiveClassCache'")

   public List<GoodsClass> getEffectiveClassCache() throws Exception {

   public List<GoodsClass> getEffectiveClassCache() {

      return goodsClassMapper.getEffectiveClass();

   }