From e84eea43fa967fdb9cebc2a1146d32d5cc1d09ef Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 14:18:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java
index ec1eb74..d5b374b 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java
@@ -78,4 +78,18 @@
@TableField(exist = false)
private Integer status;
+ @ApiModelProperty(value = "主键字符串")
+ @TableField(exist = false)
+ private String idStr;
+
+ @ApiModelProperty(value = "会员名称")
+ @TableField(exist = false)
+ private String vipName;
+
+ public String getIdStr() {
+ return String.valueOf(id);
+ }
+
+
+
}
--
Gitblit v1.7.1