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

jinpengyong

2023-11-08 943c5905b7f4ff48c7ae87c41b41aeae854f8a20

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

@@ -20,13 +20,21 @@
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AllocationApproveEnum implements IntegerValueEnum{
    /**
     *草稿
     */
    DRAFT(9, "草稿"),
    /**
     *新建
     */
    NEW_BUILT(10, "新建"),
//    NEW_BUILT(10, "新建"),
    /**
     *整改中
     */
    UNDER_RECTIFICATION(20, "整改中"),
   // CHANGE(19, "整改"),
    /**
     *整改中
     */
    UNDER_RECTIFICATION(20, "整改"),
    /**
     *审批中
     */