From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-manage/src/main/java/com/moral/api/pojo/dto/cruiser/CruiserDTO.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/cruiser/CruiserDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/cruiser/CruiserDTO.java
index af4c2ed..3ea7c5d 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/dto/cruiser/CruiserDTO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/cruiser/CruiserDTO.java
@@ -28,6 +28,15 @@
private Double flyLon;
+ private String data;
+
+
+ private String state;
+
+
+ public CruiserDTO() {
+ this.state = "1"; // ������state������������������1
+ }
@Override
public boolean equals(Object o) {
--
Gitblit v1.8.0