Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-11-02 a0a6f95ec5b92be03385eea83b64bf97fcbfa17e

 screen-api/src/main/java/com/moral/api/mapper/AllocationMapper.java

@@ -8,6 +8,9 @@
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.query.allocation.AllocationListCond;
import com.moral.api.pojo.query.allocation.AllocationPageCond;
import com.moral.api.pojo.query.app.AppAllocationPageCond;
import com.moral.api.pojo.vo.allocation.AllocationFindVo;

import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -23,6 +26,9 @@

    Page<AllocationPageExt> extPage(Page page, @Param("allocation") AllocationPageCond allocationPageCond);


    Page<AllocationPageExt> extAppPage(Page page, @Param("allocation") AppAllocationPageCond allocationPageCond);

    /**
     * 查询列表详情
     * @param allocationListCond
@@ -30,4 +36,7 @@
     */
    List<AllocationListExt> extList(@Param("allocation") AllocationListCond allocationListCond);




}