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

cjl

2023-10-27 509c208bab15c3b125b5e3f8e6df141fb1d85acb

 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java

@@ -748,6 +748,8 @@
                integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
                integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
                integerList.add(AllocationApproveEnum.DRAFT.value);
            }else if(type.equals(2)){
                integerList.add(0);
            }
        }
        if(type.equals(3)){