From 9e33d74a62e8b2b37c2f1c290a88392d352e8ece Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 四月 2026 10:57:59 +0800
Subject: [PATCH] yys

---
 src/main/java/com/ruoyi/basic/dto/ProductAndModelDto.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/dto/ProductAndModelDto.java b/src/main/java/com/ruoyi/basic/dto/ProductAndModelDto.java
index 18d15aa..18cffe3 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductAndModelDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductAndModelDto.java
@@ -1,9 +1,15 @@
 package com.ruoyi.basic.dto;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.sales.pojo.CommonFile;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @author :yys
@@ -12,8 +18,18 @@
 @Data
 public class ProductAndModelDto {
 
+    private List<CommonFile> SalesLedgerFiles;
+
+    private Long routeId;
+
+    private String routeName;
+
+    @ApiModelProperty(value = "瀛愰」鏁伴噺")
+    @Excel(name = "瀛愰」鏁伴噺")
+    private Long subItemCount;
+
     /**
-     * 瑙勬牸id
+     * 鍥剧焊缂栧彿id
      */
     private Long id;
 
@@ -44,9 +60,18 @@
 
 
     /**
-     * 浜у搧绫诲瀷(1-鐗╂枡,2-浜у搧)
+     * 浜у搧绫诲瀷(1=鑷埗,2=澶栬喘,3=濮斿)
      */
     @ApiModelProperty(value = "1=鑷埗,2=澶栬喘,3=濮斿")
     private Integer productType;
 
+
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8",shape = JsonFormat.Shape.STRING)
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "淇敼鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8",shape = JsonFormat.Shape.STRING)
+    private LocalDateTime updateTime;
+
 }

--
Gitblit v1.9.3