Merge remote-tracking branch 'origin/main'

feat:新增标注返回groupid，标注属性保存
2026-03-24 08:41:38 +08:00 · 2026-03-24 08:40:14 +08:00
1 changed files with 2 additions and 2 deletions
--- a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerVO.java
+++ b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerVO.java
@ -50,9 +50,9 @@ public class AirlineMarkerVO extends BaseEntity {
    private Integer fontSize;
    /**
-     * 坐标JSON字符串
+     * 坐标JSON
     */
-    private String coordinates;
+    private Object coordinates;
    /**
     * 简介
Author	SHA1	Message	Date
gyb	00da30d06f	Merge remote-tracking branch 'origin/main'	2026-03-24 08:41:38 +08:00
gyb	4cfc34ee21	feat:新增标注返回groupid，标注属性保存	2026-03-24 08:40:14 +08:00