From ecfcfe8ac671cd2f46dc8d9b9129e1851957b7c0 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 18 五月 2026 09:22:07 +0800
Subject: [PATCH] merge: 合并origin/dev_New_pro从bd86068d之后的所有提交

---
 src/main/java/com/ruoyi/sales/excel/InvoiceRegisAndProductExcelDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/excel/InvoiceRegisAndProductExcelDto.java b/src/main/java/com/ruoyi/sales/excel/InvoiceRegisAndProductExcelDto.java
index 8f042c6..8979504 100644
--- a/src/main/java/com/ruoyi/sales/excel/InvoiceRegisAndProductExcelDto.java
+++ b/src/main/java/com/ruoyi/sales/excel/InvoiceRegisAndProductExcelDto.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 

--
Gitblit v1.9.3