Merge remote-tracking branch 'origin/master'

lin

2024-03-23 b3a0e5051c2923b5e12b059b6634aa9bd12db59b

 src/main/java/org/springblade/modules/grid/controller/GridController.java

@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.grid.excel.GridExcel;
import org.springblade.modules.grid.excel.GridImporter;
import org.springblade.modules.system.excel.UserExcel;
@@ -156,8 +157,8 @@
    * 空间分析
    */
   @GetMapping("/spatialAnalysis")
   public R spatialAnalysis() {
      return R.data(gridService.spatialAnalysis());
   public R spatialAnalysis(DoorplateAddressEntity addressEntity) {
      return R.data(gridService.spatialAnalysis(addressEntity));
   }

   /**