From 9acb17a6871d84a85c373eb90b980f98894e30e0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 17:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Rotate.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Rotate.java b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Rotate.java
index 484ad77..1a2194c 100644
--- a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Rotate.java
+++ b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Rotate.java
@@ -31,8 +31,8 @@
private String rotatePicture;
@ApiModelProperty("排序")
- @TableField("order")
- private Integer order;
+ @TableField("sort")
+ private Integer sort;
@ApiModelProperty("跳转服务id")
@TableField("rotate_serve_id")
@@ -42,4 +42,12 @@
@TableField("is_rotate")
private Integer isRotate;
+ @ApiModelProperty("跳转服务内容")
+ @TableField(exist = false)
+ private String serveName;
+
+ @ApiModelProperty("服务类型")
+ @TableField(exist = false)
+ private Integer type;
+
}
--
Gitblit v1.7.1