From 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 13:32:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/domain/vo/admin/education/EducationResourceVO.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/EducationResourceVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/EducationResourceVO.java
index 18f4f6e..1a1f602 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/EducationResourceVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/EducationResourceVO.java
@@ -1,6 +1,7 @@
package com.ycl.jxkg.domain.vo.admin.education;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.models.auth.In;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -14,9 +15,9 @@
*/
@Data
public class EducationResourceVO {
-
+ /** 褰撳墠椤靛ぇ灏� */
private Integer pageSize = 10;
-
+ /** 褰撳墠椤� */
private Integer pageNum = 1;
private Integer id;
@@ -34,7 +35,16 @@
@NotNull(message = "璇烽�夋嫨瀛︾")
private Integer subjectId;
+ /** 瀛︾鍚� */
private String typeName;
+
+ /** 鐝骇 */
+ @NotNull(message = "璇烽�夋嫨鐝骇")
+ private Integer classId;
+ /** 瀛︾敓绔垎椤垫煡璇㈡潯浠� */
+ private List<Integer> classIds;
+ /** 鐝骇鍚� */
+ private String className;
/** 涓婚 */
@NotBlank(message = "璇疯緭鍏ヤ富棰樼畝浠�")
@@ -44,12 +54,15 @@
private List<UploadFile> attachment;
private String attachmentString;
+ private Integer createUser;
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ private String visitUrl;
@Data
public static class UploadFile {
--
Gitblit v1.8.0