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 |   60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 47 insertions(+), 13 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 1f65218..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,22 +9,32 @@
 public class MarkJsonEntity implements Serializable {
     private static final long serialVersionUID = 7776629022021914001L;
 
-    private Integer id;
+    private Long id;
 
     private String name;
 
-    private String wkt;
+    private String type;
 
-    private String props;
+    private String fillColor;
+
+    private Double opacity;
+
+    private String bak;
+
+    private String wkt;
 
     public MarkJsonEntity() {
     }
 
-    public Integer getId() {
+    public MarkJsonEntity(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -36,19 +46,43 @@
         this.name = name;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getFillColor() {
+        return fillColor;
+    }
+
+    public void setFillColor(String fillColor) {
+        this.fillColor = fillColor;
+    }
+
+    public Double getOpacity() {
+        return opacity;
+    }
+
+    public void setOpacity(Double opacity) {
+        this.opacity = opacity;
+    }
+
+    public String getBak() {
+        return bak;
+    }
+
+    public void setBak(String bak) {
+        this.bak = bak;
+    }
+
     public String getWkt() {
         return wkt;
     }
 
     public void setWkt(String wkt) {
         this.wkt = wkt;
-    }
-
-    public String getProps() {
-        return props;
-    }
-
-    public void setProps(String props) {
-        this.props = props;
     }
 }

--
Gitblit v1.9.3