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

cjl

2023-10-20 fb89f40499211dae5d74caf3cea2ea696745e7a2

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

@@ -33,6 +33,6 @@
    List<AllocationListExt> extList(@Param("allocation") AllocationListCond allocationListCond);


    List<AllocationFindVo> selectSmallRoutine( Integer state);


}