From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProject.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProject.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProject.java
index 1aa031e..57bd3da 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProject.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProject.java
@@ -1,6 +1,8 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -8,6 +10,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -18,7 +22,7 @@
@Data
@ApiModel("杩愮淮椤圭洰淇℃伅琛�")
@TableName("`yw_project`")
-public class YwProject {
+public class YwProject extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -74,5 +78,29 @@
@ApiModelProperty(value = "鍦板潃")
@ExcelColumn(name="鍦板潃")
private String addr;
+ @ApiModelProperty(value = "鎴挎簮鏁�")
+ @TableField(exist = false)
+ private Integer roomNum;
+ @ApiModelProperty(value = "鍙嫑鍟嗘埧婧愭暟")
+ @TableField(exist = false)
+ private Integer roomRentNum;
+ @ApiModelProperty(value = "绠＄悊闈㈢Н")
+ @TableField(exist = false)
+ private BigDecimal area;
+ @ApiModelProperty(value = "鍩庡競鍚嶇О")
+ @TableField(exist = false)
+ private String cityName;
+ @ApiModelProperty(value = "鍖哄煙鍚嶇О")
+ @TableField(exist = false)
+ private String areaName;
+ @ApiModelProperty(value = "鍩庡競绶ㄧ⒓")
+ @TableField(exist = false)
+ private Integer cityId;
+ @ApiModelProperty(value = "鐪佷唤鍚嶇О")
+ @TableField(exist = false)
+ private String provinceName;
+ @ApiModelProperty(value = "鐪乮d")
+ @TableField(exist = false)
+ private Integer provinceId;
}
--
Gitblit v1.9.3