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

cjl

2023-11-01 23ad681499f8652fe4e2084e6492ececb6fc7551

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