Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightIntegratingTaskService.java

@@ -1,11 +1,8 @@
package com.panzhihua.service_dangjian.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.partybuilding.NewFightResourceSharingDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO;
import com.panzhihua.service_dangjian.entity.IntegratingTask;
import org.apache.ibatis.annotations.Param;

import java.util.List;