diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/OrderQueryService.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/OrderQueryService.java
index 109b250..b187e9d 100644
--- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/OrderQueryService.java
+++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/OrderQueryService.java
@@ -1,5 +1,6 @@
 package com.viewsh.module.ops.service;
 
+import com.viewsh.framework.common.pojo.PageParam;
 import com.viewsh.framework.common.pojo.PageResult;
 import com.viewsh.module.ops.dal.dataobject.workorder.OpsOrderDO;
 
@@ -50,17 +51,7 @@ public interface OrderQueryService {
     /**
      * 工单查询条件
      */
-    class OrderQuery {
-        /**
-         * 页码（从1开始）
-         */
-        private Integer page = 1;
-
-        /**
-         * 每页大小
-         */
-        private Integer size = 20;
-
+    class OrderQuery extends PageParam {
         /**
          * 工单类型（可选）
          */
@@ -96,22 +87,6 @@ public interface OrderQueryService {
          */
         private String title;
 
-        public Integer getPage() {
-            return page;
-        }
-
-        public void setPage(Integer page) {
-            this.page = page;
-        }
-
-        public Integer getSize() {
-            return size;
-        }
-
-        public void setSize(Integer size) {
-            this.size = size;
-        }
-
         public String getOrderType() {
             return orderType;
         }
@@ -172,13 +147,13 @@ public interface OrderQueryService {
             return new OrderQuery();
         }
 
-        public OrderQuery withPage(Integer page) {
-            this.page = page;
+        public OrderQuery withPageNo(Integer pageNo) {
+            this.setPageNo(pageNo);
             return this;
         }
 
-        public OrderQuery withSize(Integer size) {
-            this.size = size;
+        public OrderQuery withPageSize(Integer pageSize) {
+            this.setPageSize(pageSize);
             return this;
         }
 
diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/OrderQueryServiceImpl.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/OrderQueryServiceImpl.java
index cfd765d..091860e 100644
--- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/OrderQueryServiceImpl.java
+++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/OrderQueryServiceImpl.java
@@ -48,7 +48,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
                 .orderByDesc(OpsOrderDO::getCreateTime);
 
         // 2. 分页查询主表
-        PageResult<OpsOrderDO> pageResult = opsOrderMapper.selectPage(query.getPage(), query.getSize(), wrapper);
+        PageResult<OpsOrderDO> pageResult = opsOrderMapper.selectPage(query, wrapper);
 
         // 3. ���换为 VO 并填充扩展信息
         List<OrderSummaryVO> voList = pageResult.getList().stream()
diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/test/java/com/viewsh/module/ops/infrastructure/code/OrderCodeGeneratorTest.java b/viewsh-module-ops/viewsh-module-ops-biz/src/test/java/com/viewsh/module/ops/infrastructure/code/OrderCodeGeneratorTest.java
index 80d5998..26a8cf3 100644
--- a/viewsh-module-ops/viewsh-module-ops-biz/src/test/java/com/viewsh/module/ops/infrastructure/code/OrderCodeGeneratorTest.java
+++ b/viewsh-module-ops/viewsh-module-ops-biz/src/test/java/com/viewsh/module/ops/infrastructure/code/OrderCodeGeneratorTest.java
@@ -53,7 +53,7 @@ class OrderCodeGeneratorTest {
         String orderCode = orderCodeGenerator.generate("CLEAN");
 
         // Then
-        String expectedDate = LocalDate.now().format(DATE_FORMAT);
+        String expectedDate = LocalDate.now().format(DATE_FORMATTER);
         String expected = String.format("CLEAN-%s-0001", expectedDate);
         assertEquals(expected, orderCode);
     }
@@ -67,7 +67,7 @@ class OrderCodeGeneratorTest {
         String orderCode = orderCodeGenerator.generate("CLEAN");
 
         // Then
-        String expectedDate = LocalDate.now().format(DATE_FORMAT);
+        String expectedDate = LocalDate.now().format(DATE_FORMATTER);
         String expected = String.format("CLEAN-%s-0002", expectedDate);
         assertEquals(expected, orderCode);
     }
@@ -96,7 +96,7 @@ class OrderCodeGeneratorTest {
         String orderCode = orderCodeGenerator.generate("CLEAN");
 
         // Then
-        String expectedDate = LocalDate.now().format(DATE_FORMAT);
+        String expectedDate = LocalDate.now().format(DATE_FORMATTER);
         String expected = String.format("CLEAN-%s-9999", expectedDate);
         assertEquals(expected, orderCode);
     }