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

jinpengyong

2023-10-16 f26786e162241b6b803ada6d19d80e1f5fb615e5

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

@@ -37,4 +37,12 @@

    @ApiModelProperty(value = "期限天数")
    private Integer changeDay;

    @ApiModelProperty(value = "上报单位id")
    private Integer escalationUnitId;

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

    private Integer isApprove;
}