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

cjl

2023-11-01 23ad681499f8652fe4e2084e6492ececb6fc7551

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

@@ -23,11 +23,11 @@
    /**
     *未申请
     */
    NOT_AAPPROVE(10, "未申请"),
    NOT_AAPPROVE(10, "未审批"),
    /**
     *申请中
     */
    APPLYING(30, "申请中"),
    APPLYING(30, "审批中"),
    /**
     *通过
     */