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

cjl

2023-11-01 23ad681499f8652fe4e2084e6492ececb6fc7551

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

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