From 52123c927f77f41f71461ef0d422525656bd7b6f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 07 五月 2026 11:53:26 +0800
Subject: [PATCH] 优化营销客户相关
---
src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
index 9a795c4..b72b3af 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,55 +16,58 @@
public class SalesQuotation {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @Schema(description = "鎶ヤ环鍗曠紪鍙�")
+ @ApiModelProperty(value = "鎶ヤ环鍗曠紪鍙�")
@Excel(name = "鎶ヤ环鍗曠紪鍙�")
private String quotationNo;
- @Schema(description = "瀹㈡埛鍚嶇О")
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customer;
- @Schema(description = "涓氬姟鍛�")
+ @ApiModelProperty(value = "瀹㈡埛id")
+ private Long customerId;
+
+ @ApiModelProperty(value = "涓氬姟鍛�")
@Excel(name = "涓氬姟鍛�")
private String salesperson;
- @Schema(description = "鎶ヤ环鏃ユ湡")
+ @ApiModelProperty(value = "鎶ヤ环鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鎶ヤ环鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate quotationDate;
- @Schema(description = "鏈夋晥鏈熻嚦")
+ @ApiModelProperty(value = "鏈夋晥鏈熻嚦")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鏈夋晥鏈熻嚦", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate validDate;
- @Schema(description = "浠樻鏂瑰紡")
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
- @Schema(description = "浜よ揣鍛ㄦ湡澶╂暟")
+ @ApiModelProperty(value = "浜よ揣鍛ㄦ湡澶╂暟")
private String deliveryPeriod;
- @Schema(description = "鐘舵��")
+ @ApiModelProperty(value = "鐘舵��")
private String status;
- @Schema(description = "鎶ヤ环鎬婚噾棰�")
+ @ApiModelProperty(value = "鎶ヤ环鎬婚噾棰�")
@Excel(name = "鎶ヤ环閲戦")
private BigDecimal totalAmount;
- @Schema(description = "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String remark;
- @Schema(description = "鍒涘缓鏃堕棿")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @Schema(description = "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @Schema(description = "淇敼鐢ㄦ埛")
+ @ApiModelProperty(value = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @Schema(description = "绉熸埛ID")
+ @ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
--
Gitblit v1.9.3