From 038f3e14174a00a111d489d5cf1b724275fe33da Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 28 Nov 2023 18:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java | 154 +++++++++++++++++++++++++-------------------------
1 files changed, 77 insertions(+), 77 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 d1cd38c..bfb6e32 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -16,15 +16,22 @@
*/
package org.springblade.modules.property.entity;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+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 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;
/**
* 物业维修资金申请表 实体类
@@ -35,83 +42,76 @@
@Data
@TableName("jczz_property_capital_apply")
@ApiModel(value = "PropertyCapitalApply对象", description = "物业维修资金申请表")
-@EqualsAndHashCode(callSuper = true)
-public class PropertyCapitalApplyEntity extends TenantEntity {
+public class PropertyCapitalApplyEntity implements Serializable {
- /**
- * 物业公司id
- */
- @ApiModelProperty(value = "物业公司id")
- private Integer propertyCompanyId;
- /**
- * 小区id
- */
- @ApiModelProperty(value = "小区id")
- private String districtId;
- /**
- * 资金申请项目名称
- */
- @ApiModelProperty(value = "资金申请项目名称")
+ private static final long serialVersionUID = 1L;
+
+
+ /** 主键 */
+ @ApiModelProperty(value = "主键ID", example = "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /** 物业公司名称 */
+ @ApiModelProperty(value = "物业公司名称", example = "")
+ @TableField("name")
private String name;
- /**
- * 联系人姓名
- */
- @ApiModelProperty(value = "联系人姓名")
- private String linkman;
- /**
- * 联系人电话
- */
- @ApiModelProperty(value = "联系人电话")
- private String linkPhone;
- /**
- * 分摊方式
- */
- @ApiModelProperty(value = "分摊方式")
- private Integer allocationWay;
- /**
- * 预算总金额
- */
- @ApiModelProperty(value = "预算总金额")
- private BigDecimal budgetAmount;
- /**
- * 实际总金额
- */
- @ApiModelProperty(value = "实际总金额")
- private BigDecimal actualAmount;
- /**
- * 自筹金额
- */
- @ApiModelProperty(value = "自筹金额")
- private BigDecimal selfAmount;
- /**
- * 预算应拨付金额
- */
- @ApiModelProperty(value = "预算应拨付金额")
- private BigDecimal budgetAppropriateAmount;
- /**
- * 预计开工时间
- */
- @ApiModelProperty(value = "预计开工时间")
- private Date runTime;
- /**
- * 预计竣工时间
- */
- @ApiModelProperty(value = "预计竣工时间")
- private Date completedTime;
- /**
- * 项目摘要
- */
- @ApiModelProperty(value = "项目摘要")
- private String projectDigest;
- /**
- * 项目描述
- */
- @ApiModelProperty(value = "项目描述")
- private String projectDescribe;
- /**
- * 施工方案附件urls
- */
- @ApiModelProperty(value = "施工方案附件urls")
- private String constructionSchemeUrls;
+
+ /** 地址 */
+ @ApiModelProperty(value = "地址", example = "")
+ @TableField("address")
+ private String address;
+
+ /** 社会信用代码 */
+ @ApiModelProperty(value = "社会信用代码", example = "")
+ @TableField("social_credit_code")
+ private String socialCreditCode;
+
+ /** 省编号 */
+ @ApiModelProperty(value = "省编号", example = "")
+ @TableField("province_code")
+ private String provinceCode;
+
+ /** 市编号 */
+ @ApiModelProperty(value = "市编号", example = "")
+ @TableField("city_code")
+ private String cityCode;
+
+ /** 区县编号 */
+ @ApiModelProperty(value = "区县编号", example = "")
+ @TableField("county_code")
+ private String countyCode;
+
+ /** 简介 */
+ @ApiModelProperty(value = "简介", example = "")
+ @TableField("remark")
+ private String remark;
+
+ /** 创建人 */
+ @ApiModelProperty(value = "创建人", example = "")
+ @TableField("create_user")
+ private String createUser;
+
+ /** 创建时间 */
+ @ApiModelProperty(value = "创建时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("create_time")
+ private Date createTime;
+
+ /** 更新人 */
+ @ApiModelProperty(value = "更新人", example = "")
+ @TableField("update_user")
+ private String updateUser;
+
+ /** 更新时间 */
+ @ApiModelProperty(value = "更新时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("update_time")
+ private Date updateTime;
+
+ /** 是否删除 0：否 1：是 */
+ @ApiModelProperty(value = "是否删除 0：否 1：是", example = "")
+ @TableField("is_deleted")
+ private Integer isDeleted;
}
--
Gitblit v1.9.3