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

yujian

2019-07-29 ac208d6f60284be820fe82dfdf44142f02d9e3ef

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java

@@ -230,7 +230,7 @@
         

         String[] idStr = ids.split(",");

         for (String id : idStr) {

            scanHistoryV2Service.deleteByAuctionIdAndDeviceOrUid(uid, acceptData.getDevice(), Long.parseLong(id));

            scanHistoryV2Service.deleteByCommonIdAndDeviceOrUid(uid, acceptData.getDevice(), Long.parseLong(id));

         }

      }

      out.print(JsonUtil.loadTrueResult(""));

@@ -296,7 +296,5 @@
      out.print(JsonUtil.loadTrueResult(data));

      return;

   }

	
	
   

}