Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java

@@ -108,9 +108,6 @@
   private IGridRangeService gridRangeService;

   @Autowired
   private IGridmanService gridmanService;

   @Autowired
   private GridMapper gridMapper;

   @Autowired
@@ -1507,4 +1504,20 @@
      }
      return null;
   }

   /**
    * 企业商超列表查询
    */
   @Override
   public IPage<PlaceVO> selectMallPage(IPage<PlaceVO> page, PlaceVO place) {
      // 公共参数设置
      CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceVO.class, place);
      List<PlaceVO> placeVOS = baseMapper.selectMallPage(page,
         place,
         commonParamSet.getGridCodeList(),
         commonParamSet.getRegionChildCodesList(),
         commonParamSet.getIsAdministrator());
      // 返回
      return page.setRecords(placeVOS);
   }
}