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

jinpengyong

2023-10-25 02a6c170797c5d2750ed07b21f22396a7683c54e

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