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

cjl

2023-10-25 090f4dac98c412c5734a706b853724e2d2accda4

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