Merge branch 'master' into test6.9.24

@@ -236,12 +236,6 @@ public class MerchantServiceImpl {
 				return new PageResponseBO<>();
 				return new PageResponseBO<>();
 			}
 			}
 		}
 		}
-
-        if (CollectionUtils.isEmpty(uids) && null == req.getOrderCode()) {  // 数据量太大，必须带上uid或者订单号
-            LOGGER.info("method earnestList in uids or ordercode is null. req is {}", req);
-            return new PageResponseBO<>();
-        }
-
     	int total = mapper.selectMerchantInfoCount(CollectionUtils.isEmpty(uids)?null:uids, stratTime, endTime, req.getStateList(),req.getOrderCode());
     	int total = mapper.selectMerchantInfoCount(CollectionUtils.isEmpty(uids)?null:uids, stratTime, endTime, req.getStateList(),req.getOrderCode());
     	if(total == 0) {
     	if(total == 0) {
     		return new PageResponseBO<>();
     		return new PageResponseBO<>();