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

cjl

2023-10-20 fb89f40499211dae5d74caf3cea2ea696745e7a2

 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, "审批中"),
    /**
     *通过
     */