From 8537a164dbd4c8696c3269141a8f18922d4ed15f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 十月 2025 09:02:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AssetAdDTO.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AssetAdDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AssetAdDTO.java
index 016eba0..e3ef974 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AssetAdDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AssetAdDTO.java
@@ -1,5 +1,8 @@
package com.ruoyi.system.dto.asset;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.write.style.ColumnWidth;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,6 +13,7 @@
* @author mitao
* @date 2025/10/17
*/
+@ExcelIgnoreUnannotated
@Data
@ApiModel("广告无形资产数据传输对象")
public class AssetAdDTO {
@@ -18,16 +22,24 @@
private Integer id;
@ApiModelProperty(value = "资产名称")
+ @ExcelProperty("资产名称")
+ @ColumnWidth(11)
@NotBlank(message = "资产名称")
private String assetName;
@ApiModelProperty(value = "位置")
+ @ExcelProperty("位置")
+ @ColumnWidth(6)
private String location;
@ApiModelProperty(value = "租赁形式（长期租赁、一次性租赁等）")
+ @ExcelProperty("租赁形式")
+ @ColumnWidth(11)
private String rentalType;
@ApiModelProperty(value = "备注")
+ @ExcelProperty("备注")
+ @ColumnWidth(6)
private String remarks;
@ApiModelProperty(value = "附件URL列表（多个使用英文逗号拼接）")
--
Gitblit v1.7.1