From 053c2264ab5d7596aea3f8fcac18d487e6f9c766 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 18:47:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetAdRentalRecord.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetAdRentalRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetAdRentalRecord.java
index e517e77..28ec529 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetAdRentalRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetAdRentalRecord.java
@@ -35,9 +35,17 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "广告无形资产ID，关联asset_advertisement表")
- @TableField("asset_advertisement_id")
- private Integer assetAdvertisementId;
+ @ApiModelProperty(value = "广告无形资产ID，关联asset_ad表")
+ @TableField("asset_ad_id")
+ private Integer assetAdId;
+
+ @ApiModelProperty(value = "使用人")
+ @TableField("use_by")
+ private String useBy;
+
+ @ApiModelProperty(value = "提醒人")
+ @TableField("remind_user")
+ private String remindUser;
@ApiModelProperty(value = "开始时间")
@TableField("start_date")
--
Gitblit v1.7.1