From f0837ee21f7650d4413830d4ee90da02bcdd6d36 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 10 Oct 2023 10:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
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