From 088bc1e162261a91a8779d8079bef9d6a5d6d3e9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 10:06:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
index 55a21ba..27f0087 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
@@ -45,6 +45,9 @@
@Excel(name = "瑙勫垯")
private String ruleName;
+ @Excel(name = "鎵ｅ噺鏂瑰紡")
+ private String deductCategory;
+
@Excel(name = "鎸囨爣")
private String num;
@@ -81,7 +84,7 @@
private Date updateTime;
@TableLogic
- private String deleted;
+ private Integer deleted;
//鏌ヨ鏉′欢
@TableField(exist = false)
--
Gitblit v1.8.0