From ee982b85c9ff09fbf6a6eb7c133b1e6f5fb160ba Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 14 八月 2026 14:56:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/vo/CrmSaleQuotationRespVO.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/vo/CrmSaleQuotationRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/vo/CrmSaleQuotationRespVO.java
index d9d037f..1dc2e15 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/vo/CrmSaleQuotationRespVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/vo/CrmSaleQuotationRespVO.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.crm.controller.admin.quotation.vo;
+import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -103,8 +104,8 @@
@ExcelProperty("鍏宠仈鍚堝悓鍗曞彿")
private String contractNo;
- @Schema(description = "闄勪欢鍦板潃", example = "https://www.baidu.com")
- private String fileUrl;
+ @Schema(description = "闄勪欢鍒楄〃")
+ private List<StorageBlobRespDTO> attachmentList;
@Schema(description = "澶囨敞", example = "澶囨敞淇℃伅")
@ExcelProperty("澶囨敞")
@@ -140,10 +141,20 @@
private String itemName;
@Schema(description = "鐗╂枡鏉＄爜", example = "BAR001")
private String itemBarCode;
+ @Schema(description = "瑙勬牸鍨嬪彿", example = "M8*20")
+ private String itemSpecification;
@Schema(description = "璁￠噺鍗曚綅缂栧彿", example = "1")
private Long itemUnitId;
@Schema(description = "璁￠噺鍗曚綅鍚嶇О", example = "涓�")
private String itemUnitName;
+ @Schema(description = "杈呭崟浣�1缂栧彿", example = "2")
+ private Long itemUnitId2;
+ @Schema(description = "杈呭崟浣�1鍚嶇О", example = "绠�")
+ private String itemUnitName2;
+ @Schema(description = "杈呭崟浣�2缂栧彿", example = "3")
+ private Long itemUnitId3;
+ @Schema(description = "杈呭崟浣�2鍚嶇О", example = "鎵�")
+ private String itemUnitName3;
@Schema(description = "鐗╂枡鍘熶环", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
private BigDecimal itemPrice;
@@ -168,4 +179,4 @@
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3