From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java |  102 +++++++++++++++++++++++++-------------------------
 1 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
index 22aeeb1..8b35b59 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
@@ -123,62 +123,62 @@
 	@TableField("is_deleted")
 	private Integer isDeleted;
 
-	/** 法人现住地址 */
-	@ApiModelProperty(value = "法人现住地址", example = "")
-	@TableField("legal_temp_address")
-	private String legalTempAddress;
-
-	/** 法人年龄 */
-	@ApiModelProperty(value = "法人年龄", example = "")
-	@TableField("legal_age")
-	private Integer legalAge;
-
-	/** 法人性别 */
-	@ApiModelProperty(value = "法人性别", example = "")
-	@TableField("legal_gender")
-	private Integer legalGender;
-
-	/** 法人身份证 */
+//	/** 法人现住地址 */
+//	@ApiModelProperty(value = "法人现住地址", example = "")
+//	@TableField("legal_temp_address")
+//	private String legalTempAddress;
+//
+//	/** 法人年龄 */
+//	@ApiModelProperty(value = "法人年龄", example = "")
+//	@TableField("legal_age")
+//	private Integer legalAge;
+//
+//	/** 法人性别 */
+//	@ApiModelProperty(value = "法人性别", example = "")
+//	@TableField("legal_gender")
+//	private Integer legalGender;
+//
+//	/** 法人身份证 */
 	@ApiModelProperty(value = "法人身份证", example = "")
 	@TableField("legal_id_card")
 	private String legalIdCard;
-
-	/** 法人证件类型,业务字典  cardType */
-	@ApiModelProperty(value = "法人证件类型,业务字典  cardType", example = "")
-	@TableField("legal_card_type")
-	private String legalCardType;
-
-	/** 法人户籍地址 */
-	@ApiModelProperty(value = "法人户籍地址", example = "")
-	@TableField("legal_registered_address")
-	private String legalRegisteredAddress;
-
-	/** 法人岗位性质 */
-	@ApiModelProperty(value = "法人岗位性质", example = "")
-	@TableField("legal_job_nature")
-	private String legalJobNature;
-
-	/** 法人微信号 */
-	@ApiModelProperty(value = "法人微信号", example = "")
-	@TableField("legal_wx_account")
-	private String legalWxAccount;
+//
+//	/** 法人证件类型,业务字典  cardType */
+//	@ApiModelProperty(value = "法人证件类型,业务字典  cardType", example = "")
+//	@TableField("legal_card_type")
+//	private String legalCardType;
+//
+//	/** 法人户籍地址 */
+//	@ApiModelProperty(value = "法人户籍地址", example = "")
+//	@TableField("legal_registered_address")
+//	private String legalRegisteredAddress;
+//
+//	/** 法人岗位性质 */
+//	@ApiModelProperty(value = "法人岗位性质", example = "")
+//	@TableField("legal_job_nature")
+//	private String legalJobNature;
+//
+//	/** 法人微信号 */
+//	@ApiModelProperty(value = "法人微信号", example = "")
+//	@TableField("legal_wx_account")
+//	private String legalWxAccount;
 
 
-	/** 生日 */
-	@ApiModelProperty(value = "生日", example = "")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	@TableField("birthday")
-	private Date birthday;
-
-	/** 民族 */
-	@ApiModelProperty(value = "民族", example = "")
-	@TableField("ethnicity")
-	private Integer ethnicity;
-
-	/** 工作单位(就职单位) */
-	@ApiModelProperty(value = "工作单位(就职单位)", example = "")
-	@TableField("employer")
-	private String employer;
+//	/** 生日 */
+//	@ApiModelProperty(value = "生日", example = "")
+//	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//	@TableField("birthday")
+//	private Date birthday;
+//
+//	/** 民族 */
+//	@ApiModelProperty(value = "民族", example = "")
+//	@TableField("ethnicity")
+//	private Integer ethnicity;
+//
+//	/** 工作单位(就职单位) */
+//	@ApiModelProperty(value = "工作单位(就职单位)", example = "")
+//	@TableField("employer")
+//	private String employer;
 
 	/** 房东名字 */
 	@ApiModelProperty(value = "房东名字", example = "")

--
Gitblit v1.9.3