From 2b0dc519ddc4fefcabc7f60dcda4968964155e11 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:45:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Param.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Param.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Param.java
index 0d779f3..9455899 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Param.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Param.java
@@ -17,11 +17,10 @@
package com.chinaztt.mes.basic.entity;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -45,8 +44,9 @@
/**
* id
*/
- @TableId
+ @TableId(type=IdType.ASSIGN_ID)
@ApiModelProperty(value="id")
+ @JSONField(serializeUsing= ToStringSerializer.class)
private Long id;
/**
* 鍙傛暟缂栧彿
@@ -103,4 +103,13 @@
*/
@ApiModelProperty(value="鏁版嵁瀛楀吀")
private String dict;
- }
+
+ @TableField(exist = false)
+ private String paramValue;
+
+ @ApiModelProperty(value="鐖剁骇鍙傛暟")
+ @TableField("parent_id")
+ @JSONField(serializeUsing= ToStringSerializer.class)
+ private Long parentId;
+
+}
--
Gitblit v1.9.3