From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java b/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java
index 19320a2..e8f4e5a 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java
@@ -4,7 +4,7 @@
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@@ -12,8 +12,13 @@
@Data
public class AfterSalesServiceNewDto extends AfterSalesService {
- @ApiModelProperty("浜у搧鍨嬪彿ID鏁扮粍")
+ @Schema(description = "浜у搧鍨嬪彿ID鏁扮粍")
private List<Long> productModelIdList;
private SalesLedgerDto salesLedgerDto;
+
+ private String salesContractNo;
+
+ private String orderNo;
+ private String afterSalesServiceNo;
}
--
Gitblit v1.9.3