From bee96a1d36c86068cd5a7eb69f4e3294a8123b04 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 03 七月 2026 18:02:55 +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/contract/vo/contract/CrmContractRespVO.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
index ca5f36e..d33143d 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
@@ -88,6 +88,10 @@
@ExcelProperty("鍚堝悓閲戦")
private BigDecimal totalPrice;
+ @Schema(description = "瀹氶噾閲戦锛屽崟浣嶏細鍏�", example = "1000.00")
+ @ExcelProperty("瀹氶噾閲戦")
+ private BigDecimal depositPrice;
+
@Schema(description = "宸插洖娆鹃噾棰�", example = "5617")
@ExcelProperty("宸插洖娆鹃噾棰�")
private BigDecimal totalReceivablePrice;
@@ -142,17 +146,21 @@
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "888")
private Long id;
- @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- private Long productId;
- @Schema(description = "浜у搧鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鏉庡洓")
- private String productName;
- @Schema(description = "浜у搧鏉＄爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- private String productNo;
- @Schema(description = "浜у搧鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED, example = "鏉庡洓")
- private Integer productUnit;
+ @Schema(description = "MDM 鐗╂枡缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
+ private Long itemId;
+ @Schema(description = "鐗╂枡缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "ITEM001")
+ private String itemCode;
+ @Schema(description = "鐗╂枡鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐗╂枡A")
+ private String itemName;
+ @Schema(description = "鐗╂枡鏉＄爜", example = "BAR001")
+ private String itemBarCode;
+ @Schema(description = "璁￠噺鍗曚綅缂栧彿", example = "1")
+ private Long itemUnitId;
+ @Schema(description = "璁￠噺鍗曚綅鍚嶇О", example = "涓�")
+ private String itemUnitName;
- @Schema(description = "浜у搧鍗曚环", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- private BigDecimal productPrice;
+ @Schema(description = "鐗╂枡鍘熶环", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ private BigDecimal itemPrice;
@Schema(description = "鍚堝悓浠锋牸", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
private BigDecimal contractPrice;
--
Gitblit v1.9.3