From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java
index 8320a2e..913edf0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java
@@ -1,10 +1,12 @@
 package com.panzhihua.common.model.vos.community.warehouse;
 
-import java.util.Date;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.utlis.StringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 
 /**
  * @title: ComActWarehouseOperationVO
@@ -19,17 +21,70 @@
 public class ComActWarehouseOperationVO {
 
     @ApiModelProperty(value = "操作记录id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "物品id")
-    private Integer goodsId;
+    private Long goodsId;
 
     @ApiModelProperty(value = "操作内容")
     private String content;
 
     @ApiModelProperty(value = "操作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty(value = "操作人")
-    private Integer userId;
+    private Long userId;
+
+    @ApiModelProperty("申请人姓名")
+    private String applyName;
+
+    @ApiModelProperty("捐赠人名称")
+    private String donateName;
+
+    @ApiModelProperty("捐赠物品名称")
+    private String item;
+
+    @ApiModelProperty("捐赠物品图片")
+    private String image;
+
+    @ApiModelProperty("捐赠物品数量")
+    private Integer goodsNum;
+
+    /**
+     * 实际时间
+     */
+    @ApiModelProperty(value = "实际时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date actualTime;
+
+    @ApiModelProperty("是否匿名(1.是 2.否)")
+    private Integer isAnonymous;
+
+    /**
+     * 理由
+     */
+    @ApiModelProperty("理由")
+    private String reason;
+
+    /**
+     * 领取图片
+     */
+    @ApiModelProperty("领取图片")
+    private String receiveUrl;
+
+    @ApiModelProperty("类型 1 content 2其他")
+    private Integer type;
+
+    public void setDonateName(String donateName) {
+        if (StringUtils.isNotEmpty(donateName)) {
+            this.donateName = donateName.charAt(0) + "**";
+        }
+    }
+
+    public void setApplyName(String applyName) {
+        if (StringUtils.isNotEmpty(applyName)) {
+            this.applyName = applyName.charAt(0) + "**";
+        }
+    }
 }

--
Gitblit v1.7.1