From 66cf674e0f18a8bdc3dc45b080763edee910a2ab Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 21 四月 2026 14:39:29 +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/XpActivity.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java
index 38538d4..e2ef53b 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,7 +27,7 @@
@Accessors(chain = true)
@TableName("xp_acticity")
@ApiModel(value="XpActicity对象", description="活动管理")
-public class XpActivity implements Serializable {
+public class XpActivity extends BaseModel {
private static final long serialVersionUID = 1L;
@@ -58,9 +59,6 @@
@ApiModelProperty(value = "邀请启用 1=是 0=否")
private Boolean inviteEnable;
-
- @ApiModelProperty(value = "是否删除")
- private String deleted;
@ApiModelProperty(value = "图片")
private String img;
--
Gitblit v1.7.1