Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java

@@ -97,6 +97,7 @@
   /** 0：否 1：是 */
   @ApiModelProperty(value = "0：否 1：是", example = "")
   @TableField("is_deleted")
   @TableLogic
   private Integer isDeleted;

   /** 申请事由 */
@@ -142,4 +143,15 @@
   @TableField("jw_grid_code")
   private String jwGridCode;


   /** 房东名称 */
   @ApiModelProperty(value = "房东名称", example = "")
   @TableField("landlord_name")
   private String landlordName;

   /** 房东电话 */
   @ApiModelProperty(value = "房东电话", example = "")
   @TableField("landlord_phone")
   private String landlordPhone;

}