From fe5975b8fc4592e3925a678c28a26563669574e9 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 17:05:36 +0800
Subject: [PATCH] Merge branch 'local_20221010' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 64ef4e8..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,12 +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
@@ -21,10 +21,10 @@
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;
@@ -34,7 +34,7 @@
private Date createTime;
@ApiModelProperty(value = "操作人")
- private Integer userId;
+ private Long userId;
@ApiModelProperty("申请人姓名")
private String applyName;
@@ -77,14 +77,14 @@
private Integer type;
public void setDonateName(String donateName) {
- if(StringUtils.isNotEmpty(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)+"**";
+ if (StringUtils.isNotEmpty(applyName)) {
+ this.applyName = applyName.charAt(0) + "**";
}
}
}
--
Gitblit v1.7.1