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

guoshilong

2024-01-11 a331dacaa853a79efb78937dd49e5f6cca22ba69

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java

@@ -5,6 +5,7 @@
import cn.gistack.sm.sjztmd.entity.AttResBase;
import cn.gistack.sm.sjztmd.vo.AttAdBaseVO;
import cn.gistack.sm.sjztmd.vo.AttResAdVO;
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -22,6 +23,8 @@
public interface IAttResBaseService extends IService<AttResBase> {

    IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase);

   IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase);

   IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj);

@@ -50,4 +53,6 @@
    * @return
    */
   AttResAdVO getWaterRegionInfoByResGuid(String guid);

   int getDimResInfoACount();
}