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

cjl

2023-10-20 fb89f40499211dae5d74caf3cea2ea696745e7a2

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

@@ -8,6 +8,8 @@
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.vo.allocation.AllocationFindVo;

import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -30,4 +32,7 @@
     */
    List<AllocationListExt> extList(@Param("allocation") AllocationListCond allocationListCond);




}