Merge remote-tracking branch 'origin/master'

yujian

2019-07-12 9d8dfb01ff72c57abad3b80f3d65e81a5354db03

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/SuperHotSearchMapper.java

@@ -17,7 +17,7 @@
    * @param systemId
    * @return
    */
   List<SuperHotSearch> listBySystemId(@Param("systemId")Long systemId);
   List<SuperHotSearch> listBySystemId(@Param("systemId")Long systemId, @Param("useType")Integer useType);
   
   
   /**