From 5ea8ef80312e8c1d3365abe7106622d676def195 Mon Sep 17 00:00:00 2001
From: huangzhen <867127663@qq.com>
Date: Fri, 30 Sep 2022 16:41:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/ruoyi/project/tr/baseCheckPoint/domain/BaseCheckPoint.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/tr/baseCheckPoint/domain/BaseCheckPoint.java b/src/main/java/com/ruoyi/project/tr/baseCheckPoint/domain/BaseCheckPoint.java
index 5dd3b2f..82b0cb5 100644
--- a/src/main/java/com/ruoyi/project/tr/baseCheckPoint/domain/BaseCheckPoint.java
+++ b/src/main/java/com/ruoyi/project/tr/baseCheckPoint/domain/BaseCheckPoint.java
@@ -1,9 +1,12 @@
 package com.ruoyi.project.tr.baseCheckPoint.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import kotlin.jvm.Transient;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -39,6 +42,7 @@
     private String checkType;
 
     /**措施id */
+    @Transient
     @Excel(name = "措施id")
     private Long controlMeasureId;
 

--
Gitblit v1.9.2