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

cjl

2023-10-20 c7dd4a195d8d893d92c49963447cdf6486844584

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


}