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

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

 screen-api/src/main/java/com/moral/api/pojo/enums/AllocationApproveEnum.java

@@ -26,7 +26,7 @@
    /**
     *新建
     */
    NEW_BUILT(10, "新建"),
//    NEW_BUILT(10, "新建"),
    /**
     *整改中
     */