Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb20231030

jinpengyong

2023-10-31 a860a554680453f533328858a525e663a22e86ed

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