From b852254d90e7d1955db31db154193ec8ee84d8b3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 09 九月 2026 10:57:59 +0800
Subject: [PATCH] feat(hrm): 新增员工用工性质、班组归属字段及考勤异常处理优化
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/vo/CrmSaleQuotationRespVO.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 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 1dc2e15..8b345a3 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
@@ -111,6 +111,34 @@
@ExcelProperty("澶囨敞")
private String remark;
+ @Schema(description = "鎶ヤ环绫诲瀷", example = "power")
+ @ExcelProperty("鎶ヤ环绫诲瀷")
+ private String quotationType;
+
+ @Schema(description = "鍚堝悓瀹归噺锛坘VA锛�", example = "800")
+ @ExcelProperty("鍚堝悓瀹归噺")
+ private BigDecimal capacity;
+
+ @Schema(description = "鏈�澶ч渶閲忥紙kW锛�", example = "400")
+ @ExcelProperty("鏈�澶ч渶閲�")
+ private BigDecimal maxDemand;
+
+ @Schema(description = "鐢靛害鍗曚环锛堝厓/kWh锛�", example = "0.5283")
+ @ExcelProperty("鐢靛害鍗曚环")
+ private BigDecimal unitPrice;
+
+ @Schema(description = "鐢典环妯″紡", example = "two-part")
+ @ExcelProperty("鐢典环妯″紡")
+ private String tariffMode;
+
+ @Schema(description = "鍔涜皟鐢佃垂锛堝厓锛�", example = "120.5")
+ @ExcelProperty("鍔涜皟鐢佃垂")
+ private BigDecimal powerFactorFee;
+
+ @Schema(description = "缁撶畻鍛ㄦ湡锛堟湀锛�", example = "12")
+ @ExcelProperty("缁撶畻鍛ㄦ湡")
+ private Integer billingCycle;
+
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
--
Gitblit v1.9.3