From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
index bfb6695..c8858ef 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -20,18 +20,14 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.Info;
-import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
-
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
-import org.springframework.format.annotation.DateTimeFormat;
/**
* 物业维修资金申请表 实体类
@@ -173,4 +169,50 @@
@ApiModelProperty("是否已删除 0:否 1:是")
private Integer isDeleted;
+ /**
+ * 流程定义id
+ */
+ @ApiModelProperty("流程定义id")
+ private String processDefinitionId;
+
+ /**
+ * 流程实例id
+ */
+ @ApiModelProperty("流程实例id")
+ private String processInstanceId;
+
+
+ /**
+ * 流程定义ke
+ */
+ @ApiModelProperty("流程定义ke")
+ private String processDefinitionKey;
+
+ /**
+ * 流程申请时间
+ */
+ @ApiModelProperty("流程申请时间")
+ private Date applyTime;
+
+ /**
+ * 申请状态
+ */
+ @ApiModelProperty("申请状态 0：待审核 1：业委会审核 2：街道审核 3：住建局审核 4：调整申请 5：审核通过 6：审核不通过 7:上饶住建局")
+ private Integer applyStatus;
+
+ private String taskId;
+
+ private Integer articleId;
+
+ /**
+ * 楼栋编码
+ */
+ @ApiModelProperty(value = "楼栋编码")
+ private String buildingCode;
+ /**
+ * 楼栋号（名称）
+ */
+ @ApiModelProperty(value = "楼栋号（名称）")
+ private String buildingName;
+
}
--
Gitblit v1.9.3