Merge branch 'mater-1.6.0' into div

admin

2019-08-23 91526d285399c7bf93588b6be910c3b849cab7e3

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java

@@ -89,7 +89,7 @@


   }



   @Cacheable(value = "integralGetCache", key = "'addSearchResultScan-'+#uid+'-'+kw")

   @Cacheable(value = "integralGetCache", key = "'addSearchResultScan-'+#uid+'-'+#kw")

   @Override

   public void addSearchResultScan(Long uid, String kw) throws IntegralGetException {

      System.out.println("搜索");