Merge remote-tracking branch 'origin/div' into div

admin

2019-09-20 db88b87df461820152d68d3d55a28f30c2da83e6

 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删除浏览记录