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

cjl

2023-10-10 495fad8166b5952c013aea275243cb9ee6e7fa2a

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