Merge remote-tracking branch 'origin/master'

lin

2024-03-23 b3a0e5051c2923b5e12b059b6634aa9bd12db59b

 src/main/java/org/springblade/modules/grid/excel/GridExcel.java

@@ -5,6 +5,7 @@
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;

@@ -24,6 +25,10 @@
   @ExcelProperty("社区网格名称")
   private String gridName;

   @ColumnWidth(15)
   @ExcelProperty("网格编号")
   private String gridCode;

   @ColumnWidth(100)
   @ExcelProperty("区域")
   private String geom;