Merge remote-tracking branch 'origin/master'

zhoushihao

2025-05-12 fbd31387721424c65b173cbb23b03202f3e7dce6

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java

@@ -1,6 +1,7 @@
package com.mes.rawglasstask.entity.request;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.mes.base.entity.PageRequest;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

@@ -8,7 +9,7 @@
import java.util.List;

@Data
public class RawGlassTaskRequest {
public class RawGlassTaskRequest extends PageRequest {

    /**
     * 任务类型   1 入库    2 出库    3 调度