From 95b6c442989442750fc2fb85869523678adcd698 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 09:35:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
index dab8936..1ee3b88 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsEntity;
+import enumeration.general.ImportantTagEnum;
+import enumeration.general.ProvinceTagEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -61,8 +63,16 @@
@TableField("dept_id")
private Long deptId;
- @TableField("point_tag")
- private String pointTag;
+ @ApiModelProperty("閲嶇偣鐐逛綅鏍囩")
+ @TableField("important_tag")
+ private ImportantTagEnum importantTag;
+
+ @ApiModelProperty("鐪佸巺鐐逛綅鏍囩")
+ @TableField("province_tag")
+ private ProvinceTagEnum provinceTag;
+
+ @TableField("serial_number")
+ private String serialNumber;
@TableField("reason")
private String reason;
@@ -74,4 +84,5 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date recoveryTime;
+
}
--
Gitblit v1.8.0