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

jinpengyong

2023-10-27 f86b4032c5824c4e69821ce9b795e8a7c236c799

 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);


}