Merge branch 'develop' into release

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

@@ -71,8 +71,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         if(StringUtils.isNotEmpty(request.getCreateStartTime()) && StringUtils.isNotEmpty(request.getCreateEndTime())){
             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);
+            startDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, startTime);
+            endDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, endTime);
         }
         // 获取分页数据
         IPage<WorkOrder> page = new Page<>(request.getPage(), request.getLimit());