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

cjl

2023-09-28 ff65dc92b93fe082e4e3b26cd949ebf6ece554e1

 screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java

@@ -96,6 +96,8 @@
    @ApiModelProperty(value = "能否申请延期")
    private Integer applyState;

    @ApiModelProperty(value = "能否审批")
    private Integer isApprove;

    public static AllocationPageVo convert(AllocationPageExt allocationPageExt) {
        AllocationPageVo allocationPageVo = BeanConverts.convert(allocationPageExt, AllocationPageVo.class);