From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 ea22042..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;
/**
* 物业维修资金申请表 实体类
@@ -201,7 +197,22 @@
/**
* 申请状态
*/
- @ApiModelProperty("申请状态 0：待审核 1：业委会审核 2：街道审核 3：住建局审核 4：调整申请 5：审核通过 6：审核不通过")
+ @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