Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-other/src/main/java/com/dsh/other/service/ISiteTypeService.java

@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.other.entity.SiteType;
import com.dsh.other.model.BaseVo;
import com.dsh.other.model.dto.siteDto.TSiteDTO;
import com.dsh.other.model.vo.siteVo.ExpireSiteSearchVO;
import com.dsh.other.model.vo.siteVo.SiteSearchVO;

import java.util.List;

@@ -15,8 +18,13 @@

    /**
     * 获取场地分类
     *
     * @return
     * @throws Exception
     */
    List<BaseVo> querySiteType() throws Exception;

    List<TSiteDTO> listAll(SiteSearchVO vo);

    List<TSiteDTO> listExipre(ExpireSiteSearchVO vo);
}