修改

blade-service-api/estate-api/src/main/java/org/springblade/estate/dto/CarDTO.java

@@ -42,8 +42,6 @@ public class CarDTO extends Car {
 
 	private Long memberId;
 
-	private String idCard;
-
 	private Query query;
 
 }

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/Car.java

@@ -42,51 +42,51 @@ public class Car extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 车牌号
-	*/
-		@ApiModelProperty(value = "车牌号")
-		private String number;
+	 * 车牌号
+	 */
+	@ApiModelProperty(value = "车牌号")
+	private String number;
 	/**
-	* 车辆类型
-	*/
-		@ApiModelProperty(value = "车辆类型")
-		private Integer type;
+	 * 车辆类型
+	 */
+	@ApiModelProperty(value = "车辆类型")
+	private Integer type;
 	/**
 	 * 车辆性质(货运、客运、营运、非运营,出租)
 	 */
 	@ApiModelProperty(value = "车辆性质(货运、客运、营运、非运营,出租)")
 	private Integer properties;
 	/**
-	* 车辆型号
-	*/
-		@ApiModelProperty(value = "车辆型号")
-		private String model;
-	/**
-	* 燃油类别
-	*/
-		@ApiModelProperty(value = "燃油类别")
-		private String fuelCategory;
-	/**
-	* 车身颜色
-	*/
-		@ApiModelProperty(value = "车身颜色")
-		private String color;
-	/**
-	* 车主姓名
-	*/
-		@ApiModelProperty(value = "车主姓名")
-		private String personName;
-	/**
-	* 车主电话
-	*/
-		@ApiModelProperty(value = "车主电话")
-		private String personPhone;
-	/**
-	* 园区ID
-	*/
-		@ApiModelProperty(value = "园区ID")
-		@JsonSerialize(using = ToStringSerializer.class)
-		private Long agencyId;
+	 * 车辆型号
+	 */
+	@ApiModelProperty(value = "车辆型号")
+	private String model;
+	/**
+	 * 燃油类别
+	 */
+	@ApiModelProperty(value = "燃油类别")
+	private String fuelCategory;
+	/**
+	 * 车身颜色
+	 */
+	@ApiModelProperty(value = "车身颜色")
+	private String color;
+	/**
+	 * 车主姓名
+	 */
+	@ApiModelProperty(value = "车主姓名")
+	private String personName;
+	/**
+	 * 车主电话
+	 */
+	@ApiModelProperty(value = "车主电话")
+	private String personPhone;
+	/**
+	 * 园区ID
+	 */
+	@ApiModelProperty(value = "园区ID")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long agencyId;
 
 	/**
 	 * 园区名称
@@ -94,27 +94,27 @@ public class Car extends BaseEntity {
 	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
-	* 小区id
-	*/
-		@ApiModelProperty(value = "小区id")
-		@JsonSerialize(using= ToStringSerializer.class)
-		private Long residentialId;
+	 * 小区id
+	 */
+	@ApiModelProperty(value = "小区id")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long residentialId;
 	/**
 	 * 小区名称
 	 */
 	@ApiModelProperty(value = "小区名称")
 	private String residentialName;
 	/**
-	* 车辆照片
-	*/
-		@ApiModelProperty(value = "车辆照片")
-		private String carImg;
+	 * 车辆照片
+	 */
+	@ApiModelProperty(value = "车辆照片")
+	private String carImg;
 	/**
-	* 企业id
-	*/
-		@ApiModelProperty(value = "企业id")
-		@JsonSerialize(using = ToStringSerializer.class)
-		private Long enterpriseId;
+	 * 企业id
+	 */
+	@ApiModelProperty(value = "企业id")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long enterpriseId;
 
 	/**
 	 * 企业名称
@@ -122,43 +122,43 @@ public class Car extends BaseEntity {
 	@ApiModelProperty(value = "企业名称")
 	private String enterpriseName;
 	/**
-	* 机构路径
-	*/
-		@ApiModelProperty(value = "机构路径")
-		private String orgPosition;
-	/**
-	* 车主id:若为园区租户则为住户id，若为园区租户则为员工id
-	*/
-		@ApiModelProperty(value = "车主id:若为园区租户则为住户id，若为园区租户则为员工id")
-		@JsonSerialize(using = ToStringSerializer.class)
-		private Long personId;
-	/**
-	* 所属停车场id
-	*/
-		@ApiModelProperty(value = "所属停车场id")
-		@JsonSerialize(using = ToStringSerializer.class)
-		@TableField(updateStrategy = FieldStrategy.IGNORED)
-		private Long parkingLotId;
-	/**
-	* 行驶证正面图片地址
-	*/
-		@ApiModelProperty(value = "行驶证正面图片地址")
-		private String vehicleDrivingLicense1;
-	/**
-	* 审核状态：-1 审核不通过  0-待审核 1-审核通过
-	*/
-		@ApiModelProperty(value = "审核状态：-1 审核不通过  0-待审核 1-审核通过")
-		private Integer auditStatus;
-	/**
-	* 审核意见
-	*/
-		@ApiModelProperty(value = "审核意见")
-		private String auditOpinion;
-	/**
-	* 行驶证背面图片地址
-	*/
-		@ApiModelProperty(value = "行驶证背面图片地址")
-		private String vehicleDrivingLicense2;
+	 * 机构路径
+	 */
+	@ApiModelProperty(value = "机构路径")
+	private String orgPosition;
+	/**
+	 * 车主id:若为园区租户则为住户id，若为园区租户则为员工id
+	 */
+	@ApiModelProperty(value = "车主id:若为园区租户则为住户id，若为园区租户则为员工id")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long personId;
+	/**
+	 * 所属停车场id
+	 */
+	@ApiModelProperty(value = "所属停车场id")
+	@JsonSerialize(using = ToStringSerializer.class)
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Long parkingLotId;
+	/**
+	 * 行驶证正面图片地址
+	 */
+	@ApiModelProperty(value = "行驶证正面图片地址")
+	private String vehicleDrivingLicense1;
+	/**
+	 * 审核状态：-1 审核不通过  0-待审核 1-审核通过
+	 */
+	@ApiModelProperty(value = "审核状态：-1 审核不通过  0-待审核 1-审核通过")
+	private Integer auditStatus;
+	/**
+	 * 审核意见
+	 */
+	@ApiModelProperty(value = "审核意见")
+	private String auditOpinion;
+	/**
+	 * 行驶证背面图片地址
+	 */
+	@ApiModelProperty(value = "行驶证背面图片地址")
+	private String vehicleDrivingLicense2;
 
 	/**
 	 * 租户id
@@ -167,7 +167,7 @@ public class Car extends BaseEntity {
 	private String tenantId;
 
 	/**
-	 *  租户类型 0 社区 1 园区
+	 * 租户类型 0 社区 1 园区
 	 */
 	@ApiModelProperty(value = "租户类型")
 	private String tenantType;

community-app-gateway/src/main/java/org/springblade/app/controller/CarController.java

@@ -78,7 +78,7 @@ public class CarController {
 		carDTO.setQuery(query);
 		carDTO.setMemberId(memberId);
 		carDTO.setResidentialId(residentialId);
-		carDTO.setIdCard(member.getIdcard());
+		carDTO.setUserIdCard(member.getIdcard());
 		return carClient.page(carDTO);
 	}