From 3322c20909d2cc762b9a7a4a4c8b2bb728ebebd9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 16 三月 2026 14:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java b/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
index 7063498..7357a19 100644
--- a/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.quality.dto;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.inspectiontask.pojo.QualityInspectItem;
import com.ruoyi.quality.pojo.RawMaterial;
import io.swagger.annotations.ApiModel;
@@ -42,9 +43,11 @@
private List<QualityInspectItem> qualityInspectItem;
@ApiModelProperty("浜у搧鍚嶇О")
+ @Excel(name = "浜у搧鍚嶇О")
private String productName;
@ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Excel(name = "瑙勬牸鍨嬪彿")
private String model;
@ApiModelProperty("浜у搧id")
--
Gitblit v1.9.3