From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyVO.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyVO.java
index 478ed4f..58a0d11 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyVO.java
@@ -4,6 +4,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -13,13 +14,13 @@
 @Data
 @ApiModel("义仓物品申领记录实体")
 public class ComActWarehouseApplyVO {
-    private Integer id;
+    private Long id;
 
     /**
      * 物品id
      */
     @ApiModelProperty(value = "物品id")
-    private Integer goodsId;
+    private Long goodsId;
 
     /**
      * 物品数量
@@ -32,6 +33,7 @@
      */
     @ApiModelProperty(value = "预约时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date reserveTime;
 
     /**
@@ -90,6 +92,12 @@
      */
     @ApiModelProperty(value = "处理人备注")
     private String solveContent;
+
+    /**
+     * 处理人
+     */
+    @ApiModelProperty(value = "处理人")
+    private String solveName;
 
     /**
      * 核销人id
@@ -151,6 +159,13 @@
      */
     @ApiModelProperty("核销人")
     private String writeOffUserName;
+
+    /**
+     *剩下数量
+     */
+    @ApiModelProperty("剩下数量")
+    private Integer surplusQuantity;
+
     /**
      * 状态 0待处理 1 待领取 2已拒绝 3已领取 -1已取消
      */

--
Gitblit v1.7.1