From f6a1c27aff490f53c498776af00863801ff1942b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 20 四月 2026 12:21:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicity.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java
similarity index 93%
copy from xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicity.java
copy to xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java
index 40ab974..0ce0585 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicity.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java
@@ -10,6 +10,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import java.io.Serializable;
import java.time.LocalDateTime;
/**
@@ -25,7 +26,7 @@
@Accessors(chain = true)
@TableName("xp_acticity")
@ApiModel(value="XpActicity对象", description="活动管理")
-public class XpActicity {
+public class XpActivity implements Serializable {
private static final long serialVersionUID = 1L;
@@ -60,8 +61,5 @@
@ApiModelProperty(value = "图片")
private String img;
-
- @ApiModelProperty(value = "是否第一次 1=是 0=否")
- private Boolean isFirst;
}
--
Gitblit v1.7.1