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

jinpengyong

2023-10-27 54c0125835e850b97793601ac45ee62fa1c4b12e

 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;
}