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

admin

2019-09-17 5eab2b71f0749e9f61fc83d9d7e03553e9fa75ef

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