From 64812ecec137ffd019993c429116a8000edc6f46 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 10 三月 2026 10:58:41 +0800
Subject: [PATCH] yys 1.工资计算修改
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementAddDto.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementAddDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementAddDto.java
index 9e7c186..25c591c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementAddDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementAddDto.java
@@ -1,7 +1,12 @@
package com.ruoyi.procurementrecord.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -16,10 +21,17 @@
private String nickName;
/**
- * 鍏ュ簱绫诲瀷 1-閲囪喘 2-鐢熶骇
+ * 鍏ュ簱绫诲瀷 1-閲囪喘 2-鐢熶骇 3-鑷畾涔�
*/
private Integer type;
private String typeName;
+ private Integer purchaseLedgerId;
+ private Long qualityInspectId;
+
+ @ApiModelProperty("鍏ュ簱鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss ")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime inboundTime;
}
--
Gitblit v1.9.3