From 2da75f7a5c4fee35770b88998dd15f33277a7a88 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 18 九月 2024 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java
index c38c6bf..d8bea2b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java
@@ -35,7 +35,8 @@
/** deptid */
@Excel(name = "鍖哄幙")
private Long deptId;
-
+ @TableField(exist = false)
+ private String deptName;
/** 鑰冩牳妯℃澘id */
@Excel(name = "鑰冩牳妯℃澘id")
private Integer templateId;
@@ -45,8 +46,8 @@
@Excel(name = "鑰冩牳鏍囩(鐪佸巺/甯傚眬)")
private Integer examineTag;
- /** 鑰冩牳绫诲瀷(杞﹁締/浜鸿劯/瑙嗛) */
- @Excel(name = "鑰冩牳绫诲瀷(杞﹁締/浜鸿劯/瑙嗛)")
+ /** 鑰冩牳绫诲瀷(瑙嗛/杞﹁締/浜鸿劯) */
+ @Excel(name = "鑰冩牳绫诲瀷(瑙嗛/杞﹁締/浜鸿劯)")
private Short examineCategory;
/** 淇敼鏃堕棿 */
@Excel(name = "淇敼鏃堕棿")
--
Gitblit v1.8.0