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

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

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

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