From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/entity/ctrl/MarkJsonEntity.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/lf/server/entity/ctrl/MarkJsonEntity.java b/src/main/java/com/lf/server/entity/ctrl/MarkJsonEntity.java
index 4f1823c..32b7843 100644
--- a/src/main/java/com/lf/server/entity/ctrl/MarkJsonEntity.java
+++ b/src/main/java/com/lf/server/entity/ctrl/MarkJsonEntity.java
@@ -9,9 +9,11 @@
public class MarkJsonEntity implements Serializable {
private static final long serialVersionUID = 7776629022021914001L;
- private Integer id;
+ private Long id;
private String name;
+
+ private String type;
private String fillColor;
@@ -24,15 +26,15 @@
public MarkJsonEntity() {
}
- public MarkJsonEntity(Integer id) {
+ public MarkJsonEntity(Long id) {
this.id = id;
}
- public Integer getId() {
+ public Long getId() {
return id;
}
- public void setId(Integer id) {
+ public void setId(Long id) {
this.id = id;
}
@@ -44,6 +46,14 @@
this.name = name;
}
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
public String getFillColor() {
return fillColor;
}
--
Gitblit v1.9.3