From 947d016e4bd349b78d540e3a869f55d68b2c610c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 08 十一月 2022 18:16:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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..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,11 +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
@@ -20,19 +21,20 @@
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;
@@ -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