From 5a7683e98e626cba3b52fd621b4d5340e16b6f2a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 15 三月 2025 15:47:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/request/TaskHistoryRequest.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/request/TaskHistoryRequest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/request/TaskHistoryRequest.java
index 39f8572..dda4633 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/request/TaskHistoryRequest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/request/TaskHistoryRequest.java
@@ -1,6 +1,7 @@
 package com.mes.opctask.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mes.base.entity.PageRequest;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +15,7 @@
  * @Description:
  */
 @Data
-public class TaskHistoryRequest {
+public class TaskHistoryRequest extends PageRequest {
 
     @ApiModelProperty(value = "璁惧id")
     private Integer deviceId;

--
Gitblit v1.8.0