From 41ab7abd0b0ec0fefb03b60bbaf42c02fbda666b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 15:53:16 +0800
Subject: [PATCH] feat(production): 添加生产订单与销售台账关联功能
---
src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java b/src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java
index 85f49a5..87f2cc6 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java
@@ -11,8 +11,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("customer_private")
-@ApiModel(value = "CustomerPrivate瀵硅薄", description = "瀹㈡埛妗ｆ")
+@Schema(name = "CustomerPrivate瀵硅薄", description = "瀹㈡埛妗ｆ")
public class CustomerPrivate implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,73 +34,73 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty("绾崇◣浜鸿瘑鍒彿")
+ @Schema(description = "绾崇◣浜鸿瘑鍒彿")
@Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNumber;
- @ApiModelProperty("鍏徃鍦板潃")
+ @Schema(description = "鍏徃鍦板潃")
@Excel(name = "鍏徃鍦板潃")
private String companyAddress;
- @ApiModelProperty("鍏徃鐢佃瘽")
+ @Schema(description = "鍏徃鐢佃瘽")
@Excel(name = "鍏徃鐢佃瘽")
private String companyPhone;
- @ApiModelProperty("鑱旂郴浜�")
+ @Schema(description = "鑱旂郴浜�")
@Excel(name = "鑱旂郴浜�")
private String contactPerson;
- @ApiModelProperty("鑱旂郴鐢佃瘽")
+ @Schema(description = "鑱旂郴鐢佃瘽")
@Excel(name = "鑱旂郴鐢佃瘽", cellType = Excel.ColumnType.STRING)
private String contactPhone;
- @ApiModelProperty("缁存姢浜�")
+ @Schema(description = "缁存姢浜�")
@Excel(name = "缁存姢浜�")
private String maintainer;
- @ApiModelProperty("缁存姢鏃堕棿")
+ @Schema(description = "缁存姢鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "缁存姢鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date maintenanceTime;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("閾惰鍩烘湰鎴�")
+ @Schema(description = "閾惰鍩烘湰鎴�")
@Excel(name = "閾惰鍩烘湰鎴�")
private String basicBankAccount;
- @ApiModelProperty("閾惰璐﹀彿")
+ @Schema(description = "閾惰璐﹀彿")
@Excel(name = "閾惰璐﹀彿")
private String bankAccount;
- @ApiModelProperty("寮�鎴疯鍙�")
+ @Schema(description = "寮�鎴疯鍙�")
@Excel(name = "寮�鎴疯鍙�")
private String bankCode;
- @ApiModelProperty("瀹㈡埛鍒嗙被锛氶浂鍞鎴凤紝杩涢攢鍟嗗鎴�")
+ @Schema(description = "瀹㈡埛鍒嗙被锛氶浂鍞鎴凤紝杩涢攢鍟嗗鎴�")
@Excel(name = "瀹㈡埛鍒嗙被")
private String customerType;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty("璺熻繘绋嬪害")
+ @Schema(description = "璺熻繘绋嬪害")
@TableField(exist = false)
private String followUpLevel;
- @ApiModelProperty("璺熻繘鏃堕棿")
+ @Schema(description = "璺熻繘鏃堕棿")
@TableField(exist = false)
private Date followUpTime;
--
Gitblit v1.9.3