From 393df8c2013b34fdd60bff312815d6a05d3e0ecc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 02 四月 2024 10:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java
index 14073d9..775fa37 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java
@@ -32,16 +32,20 @@
@Excel(name = "鑰冩牳id")
private Long examineId;
- /** 鎿嶄綔绫诲瀷 1/2 绯荤粺鎵撳垎/浜哄伐鎵撳垎 */
- @Excel(name = "鎿嶄綔绫诲瀷 1/2 绯荤粺鎵撳垎/浜哄伐鎵撳垎")
- private Long operateCategory;
-
- /** 绉垎绫诲瀷 */
- @Excel(name = "绉垎绫诲瀷")
- private Long scoreCategory;
+ private String examineCategory;
+ private String ruleCategory;
private String unitName;
+
private String examineName;
+
+ public String getRuleCategory() {
+ return ruleCategory;
+ }
+
+ public void setRuleCategory(String ruleCategory) {
+ this.ruleCategory = ruleCategory;
+ }
public String getUnitName() {
return unitName;
@@ -95,23 +99,13 @@
{
return examineId;
}
- public void setOperateCategory(Long operateCategory)
- {
- this.operateCategory = operateCategory;
+
+ public String getExamineCategory() {
+ return examineCategory;
}
- public Long getOperateCategory()
- {
- return operateCategory;
- }
- public void setScoreCategory(Long scoreCategory)
- {
- this.scoreCategory = scoreCategory;
- }
-
- public Long getScoreCategory()
- {
- return scoreCategory;
+ public void setExamineCategory(String examineCategory) {
+ this.examineCategory = examineCategory;
}
@Override
@@ -121,8 +115,8 @@
", score=" + score +
", unitId=" + unitId +
", examineId=" + examineId +
- ", operateCategory=" + operateCategory +
- ", scoreCategory=" + scoreCategory +
+ ", examineCategory='" + examineCategory + '\'' +
+ ", ruleCategory='" + ruleCategory + '\'' +
", unitName='" + unitName + '\'' +
", examineName='" + examineName + '\'' +
'}';
--
Gitblit v1.8.0