Merge branch 'develop' into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/WorkOrderServiceImpl.java

@@ -69,8 +69,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         Date startDate = null;
         Date endDate = null;
         if(StringUtils.isNotEmpty(request.getCreateStartTime()) && StringUtils.isNotEmpty(request.getCreateEndTime())){
-            String startTime = request.getCreateStartTime() + "00:00:00";
-            String endTime = request.getCreateEndTime() + "23:59:59";
+            String startTime = request.getCreateStartTime() + " 00:00:00";
+            String endTime = request.getCreateEndTime() + " 23:59:59";
             startDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD, startTime);
             endDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD, endTime);
         }