From e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 13:39:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectPageRequestVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectPageRequestVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectPageRequestVO.java
index cff8ffd..a31f7ad 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectPageRequestVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectPageRequestVO.java
@@ -7,7 +7,7 @@
 @Data
 public class SubjectPageRequestVO extends BasePage {
 
-    private Integer name;
+    private String name;
 
     private Integer status;
 

--
Gitblit v1.8.0