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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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

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