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

jinpengyong

2023-10-20 a9cc2343ceaad3e99dc25eb036dc99aeded279a6

 screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java

@@ -43,4 +43,6 @@

    @ApiModelProperty(value = "上报人")
    private String escalationName;

    private Integer isApprove;
}