Merge remote-tracking branch 'origin/master'

linwe

2023-11-21 751d072226c4c64f5624f0c8bd2518043a861fc9

 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java

@@ -19,6 +19,7 @@
import org.apache.ibatis.annotations.Param;
import org.springblade.common.node.TreeNode;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
import org.springblade.modules.place.vo.PlaceVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -82,4 +83,11 @@
    * @return
    */
   PlaceVO getDetail(@Param("place") PlaceEntity place);

   /**
    * 判断商超是否导入
    * @param placeExcel
    * @return
    */
   PlaceEntity getPlaceAndRelInfo(@Param("place") PlaceAndRelExcel placeExcel);
}