Merge branch 'master' into dev

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderDepositRefundRecordBiz.java

@@ -51,7 +51,6 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
      */
     @Transactional
     public void saveNormalRecord(DepositRefundRecord depositRefundRecord) {
-        log.info("正常还车，添加押金记录： depositRefundRecord = {}", depositRefundRecord.toString());
         depositRefundRecord.setStatus(DepositRefundStatus.INITIATEREFUND.getCode());
         depositRefundRecord.setIscomplete(true);
         insertSelectiveRe(depositRefundRecord);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -113,17 +113,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
 			return ObjectRestResponse.succ(new PageDataVO<>());
 		}
 
-        if (dto.getStartTime() != null) {
-            if (dto.getEndTime() == null) {
-                dto.setEndTime(new Date().getTime());
-            }
-        }
-        //车辆排班表查询订单详情
-        if (dto.getOneNo()!=null) {
-            dto.setPage(1);
-            dto.setLimit(1);
-            dto.setType(1);
-        }
         if (StringUtils.isNotBlank(dto.getPhone()) || StringUtils.isNotBlank(dto.getRealName())) {
             List<AppUserLogin> appUserLoins = userFeign.getOne(dto.getPhone(), dto.getRealName());
             if (CollectionUtil.isNotEmpty(appUserLoins)) {