From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 19:08:32 +0800
Subject: [PATCH] 服务范围优化

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 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 b505269..64ef4e8 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
@@ -3,6 +3,7 @@
 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;
@@ -29,6 +30,7 @@
     private String content;
 
     @ApiModelProperty(value = "操作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty(value = "操作人")
@@ -65,7 +67,24 @@
     @ApiModelProperty("理由")
     private String reason;
 
+    /**
+     * 领取图片
+     */
+    @ApiModelProperty("领取图片")
+    private String receiveUrl;
+
+    @ApiModelProperty("类型 1 content 2其他")
+    private Integer type;
+
     public void setDonateName(String donateName) {
-        this.donateName = donateName.charAt(0)+"**";
+        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