From 08cad817f057c4a10e1ea59e362fbb492f3381df Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 22 五月 2024 16:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java
index b39829f..2e31328 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java
@@ -1,29 +1,25 @@
package com.yuanchu.mom.dto;
import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
import com.yuanchu.mom.pojo.InsReport;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.Size;
import java.io.Serializable;
@Data
public class ReportPageDto extends InsReport implements Serializable {
- @ValueTableShow(2)
@ApiModelProperty(value = "濮旀墭缂栧彿")
private String entrustCode;
- @ValueTableShow(value = 3,name = "缂栧埗浜�")
- private String updateUserName;
+ @ValueTableShow(value = 3,name = "鎻愪氦浜�")
+ private String writeUserName;
- @ValueTableShow(value = 8,name = "鎵瑰噯浜�")
+ @ValueTableShow(value = 10,name = "鎵瑰噯浜�")
private String ratifyUser;
- @ValueTableShow(value = 5,name = "瀹℃牳浜�")
+ @ValueTableShow(value = 6,name = "瀹℃牳浜�")
private String examineUser;
}
--
Gitblit v1.9.3