From 9576bebcacea938771f6f5b51d958e6a4ac59df6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 09 十二月 2021 16:59:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyVO.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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..1aae24a 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;
@@ -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