Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-10-10 4319627cf67d19093a18ff724c21782e34fc7a26

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