From 65bf12d8c871308e36fff97d985f49ad6bce6adc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 07 四月 2026 16:01:09 +0800
Subject: [PATCH] feat: 支持个人对私录入销售订单；支持个人采购；供应商、客户档案、销售采购导入导出修改
---
src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
index 31785df..db45394 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
@@ -1,11 +1,21 @@
package com.ruoyi.approve.vo;
+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 org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
@Data
public class ApproveGetAndUpdateVo {
+
+ private List<String> tempFileIds;
//瀹℃壒id
@NotBlank(message = "娴佺▼缂栧彿涓嶈兘涓虹┖")
private String id;
@@ -15,11 +25,29 @@
private String approveUserIds;
+ private String approveDeptName;
+
private Long approveUser;
private String approveTime;
private Integer approveStatus;
+
+ @Excel(name = "寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd",width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
+
+ @Excel(name = "缁撴潫鏃堕棿", dateFormat = "yyyy-MM-dd",width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
+
+ private BigDecimal price;
+
+ private String location;
/**
* 瀹℃壒绫诲瀷
*/
--
Gitblit v1.9.3