Merge remote-tracking branch 'origin/master'

zhongrj

2024-11-25 a09e361bfcb68a809e9143eca87bed2d66af2216

 src/main/java/org/springblade/modules/yw/service/impl/GeomInfoServiceImpl.java

@@ -146,7 +146,7 @@
   private void setFirmId(GeomInfoEntity geomInfoEntity,String firmName) {
      if (!Strings.isBlank(firmName)) {
         QueryWrapper<FirmInfo> wrapper = new QueryWrapper<>();
         wrapper.eq("name", firmName);
         wrapper.like("name", '%' +firmName + '%');
         FirmInfo one = firmInfoService.getOne(wrapper);
         if (null!=one)
            geomInfoEntity.setFirmId(one.getId());