Merge remote-tracking branch 'origin/master'

lin

2024-02-28 92a3b953f2da493e68afb9ae73a15b6513a6c18a

 src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java

@@ -22,11 +22,9 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import lombok.Data;

import java.io.Serializable;

@@ -99,6 +97,7 @@
    * 乡镇街道编号
    */
   @ApiModelProperty(value = "乡镇街道编号")
   @TableField("town_street_code")
   private String townStreetCode;
   /**
    * 乡镇街道名称