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/YwRoom.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwRoom.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwRoom.java index caa8f4a..d0434c4 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwRoom.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwRoom.java @@ -106,6 +106,13 @@ @ExcelColumn(name="鎵�灞炴ゼ瀹囩紪鐮侊紙鍏宠仈yw_building)") private Integer buildingId; + @ApiModelProperty(value = "褰撳墠绉熻祦鐘舵�侊細0=鏈璧侊紱1=宸茬璧�") + private Integer leaseNowStatus; + + @ApiModelProperty(value = "閫�绉熷埌鏈熸棩鏈燂紝閫�绉熶娇鐢�") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date leaseRentDate; + @ApiModelProperty(value = "绉熻祦鐘舵�侊細0=寰呯璧侊紱1=宸茬璧� ;2=鏈紑鍚璧�", example = "1") @TableField(exist = false) private Integer leaseStatus; -- Gitblit v1.9.3