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

yj

2020-03-13 1da0cccd804b441ac94a35f28a2ed23a6a7062cc

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java

@@ -446,8 +446,7 @@
                  desc.append("180天安全订单数:" + record.getExtraInfo().getSafeOrderCount());
               }
               
               Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
               if (countOrder != null && countOrder > 10) {
               if (record.getExtraInfo().getLess10OrderCount() != null && record.getExtraInfo().getLess10OrderCount() > 10) {
                  desc.append("刷单嫌疑\n#");
               }