Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-07 64a1ca289eda4deb422549311c4539b09fd30ba3

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

@@ -55,7 +55,7 @@
    * @param uid

    * @param device

    */

   public void deleteByDeviceOrUid(Long uid, String device, Integer goodsType);

   public void deleteByDeviceOrUid(Long uid, String device);



   /**

    * 根据用户或者设备和淘宝商品ID删除浏览记录