From 9f99167aba3720cb731298511f8423b18c08e5a2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 05 三月 2026 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 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..e11722e 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
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 lombok.Data;
@@ -32,6 +33,14 @@
@ApiModelProperty("鐘舵�� 1-寰呭鐞� 2-宸插鐞�")
private Integer status;
+ @ApiModelProperty("鍞悗鍗曞彿")
+ private String afterSalesServiceNo;
+
+
+ @Excel(name = "鐘舵��", readConverterExp = "1=寰呭鐞�,2=宸插鐞�")
+ @TableField(exist = false)
+ private String statusName;
+
/**
* 鐧昏浜�
*/
@@ -42,6 +51,7 @@
* 鐧昏浜哄悕绉�
*/
@ApiModelProperty("鐧昏浜哄悕绉�")
+ @Excel(name = "鐧昏浜哄悕绉�")
private String checkNickName;
/**
@@ -54,24 +64,28 @@
* 澶勭悊浜哄悕绉�
*/
@ApiModelProperty("澶勭悊浜哄悕绉�")
+ @Excel(name = "澶勭悊浜哄悕绉�")
private String disposeNickName;
/**
* 瀹㈡埛鍚嶇О
*/
@ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
/**
* 闂鎻忚堪
*/
@ApiModelProperty("闂鎻忚堪")
+ @Excel(name = "闂鎻忚堪")
private String proDesc;
/**
* 澶勭悊缁撴灉
*/
@ApiModelProperty("澶勭悊缁撴灉")
+ @Excel(name = "澶勭悊缁撴灉")
private String disRes;
/**
@@ -80,6 +94,7 @@
@ApiModelProperty("鍙嶉鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍙嶉鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date feedbackDate;
/**
@@ -88,6 +103,7 @@
@ApiModelProperty("澶勭悊鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "澶勭悊鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date disDate;
@@ -126,5 +142,22 @@
private String deptName;
+ @ApiModelProperty("鍞悗绫诲瀷")
+ private String serviceType;
+
+ @ApiModelProperty("绱ф�ョ▼搴�")
+ private String urgency;
+
+ @ApiModelProperty("閿�鍞彴璐D")
+ private Long salesLedgerId;
+
+ @ApiModelProperty("鍒嗛厤浜篒D")
+ private Long distributionUserId;
+
+
+ @ApiModelProperty("浜у搧鍨嬪彿IDs")
+ private String productModelIds;
+
+
}
--
Gitblit v1.9.3