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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

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