From dc1c8c974d9469591ead4dd1d774bbfb97a33331 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 27 Sep 2023 17:51:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-api/src/main/java/com/moral/api/entity/GovMonitorPoint.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/GovMonitorPoint.java b/screen-api/src/main/java/com/moral/api/entity/GovMonitorPoint.java
index 62024c1..27c01e5 100644
--- a/screen-api/src/main/java/com/moral/api/entity/GovMonitorPoint.java
+++ b/screen-api/src/main/java/com/moral/api/entity/GovMonitorPoint.java
@@ -1,10 +1,12 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import java.util.Date;
+import java.util.Map;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -87,12 +89,12 @@
/**
* ������
*/
+ @TableField("`desc`")
private String desc;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+ @TableField(exist = false)
+ private String data;
+
}
--
Gitblit v1.8.0