From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro

---
 src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java |   63 ++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
index f8c459d..43fa217 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
@@ -2,8 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -18,7 +18,7 @@
  */
 @Data
 @TableName("after_sales_service")
-@ApiModel
+@Schema
 public class AfterSalesService {
 
     private static final long serialVersionUID = 1L;
@@ -29,65 +29,80 @@
     /**
      * 鐘舵�� 1-寰呭鐞� 2-宸插鐞�
      */
-    @ApiModelProperty("鐘舵�� 1-寰呭鐞� 2-宸插鐞�")
+    @Schema(description = "鐘舵�� 1-寰呭鐞� 2-宸插鐞�")
     private Integer status;
+
+    @Schema(description = "鍞悗鍗曞彿")
+    private String afterSalesServiceNo;
+
+
+    @Excel(name = "鐘舵��", readConverterExp = "1=寰呭鐞�,2=宸插鐞�")
+    @TableField(exist = false)
+    private String statusName;
 
     /**
      * 鐧昏浜�
      */
-    @ApiModelProperty("鐧昏浜�")
+    @Schema(description = "鐧昏浜�")
     private Long checkUserId;
 
     /**
      * 鐧昏浜哄悕绉�
      */
-    @ApiModelProperty("鐧昏浜哄悕绉�")
+    @Schema(description = "鐧昏浜哄悕绉�")
+    @Excel(name = "鐧昏浜哄悕绉�")
     private String checkNickName;
 
     /**
      * 澶勭悊浜�
      */
-    @ApiModelProperty("澶勭悊浜�")
+    @Schema(description = "澶勭悊浜�")
     private Long disposeUserId;
 
     /**
      * 澶勭悊浜哄悕绉�
      */
-    @ApiModelProperty("澶勭悊浜哄悕绉�")
+    @Schema(description = "澶勭悊浜哄悕绉�")
+    @Excel(name = "澶勭悊浜哄悕绉�")
     private String disposeNickName;
 
     /**
      * 瀹㈡埛鍚嶇О
      */
-    @ApiModelProperty("瀹㈡埛鍚嶇О")
+    @Schema(description = "瀹㈡埛鍚嶇О")
+    @Excel(name = "瀹㈡埛鍚嶇О")
     private String customerName;
 
     /**
      * 闂鎻忚堪
      */
-    @ApiModelProperty("闂鎻忚堪")
+    @Schema(description = "闂鎻忚堪")
+    @Excel(name = "闂鎻忚堪")
     private String proDesc;
 
     /**
      * 澶勭悊缁撴灉
      */
-    @ApiModelProperty("澶勭悊缁撴灉")
+    @Schema(description = "澶勭悊缁撴灉")
+    @Excel(name = "澶勭悊缁撴灉")
     private String disRes;
 
     /**
      * 鍙嶉鏃ユ湡
      */
-    @ApiModelProperty("鍙嶉鏃ユ湡")
+    @Schema(description = "鍙嶉鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鍙嶉鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
     private Date feedbackDate;
 
     /**
      * 澶勭悊鏃ユ湡
      */
-    @ApiModelProperty("澶勭悊鏃ユ湡")
+    @Schema(description = "澶勭悊鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "澶勭悊鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
     private Date disDate;
 
 
@@ -122,9 +137,29 @@
     private Long tenantId;
 
     @TableField(exist = false)
-    @ApiModelProperty("閮ㄩ棬鍚嶇О")
+    @Schema(description = "閮ㄩ棬鍚嶇О")
     private String deptName;
 
 
+    @Schema(description = "鍞悗绫诲瀷")
+    private String serviceType;
 
+    @Schema(description = "绱ф�ョ▼搴�")
+    private String urgency;
+
+    @Schema(description = "閿�鍞彴璐D")
+    private Long salesLedgerId;
+
+    @Schema(description = "鍒嗛厤浜篒D")
+    private Long distributionUserId;
+
+
+    @Schema(description = "浜у搧鍨嬪彿IDs")
+    private String productModelIds;
+
+
+
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3