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

jinpengyong

2023-11-15 84e740f362d574b942b1c9a274425841c9167de8

 screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java

@@ -78,6 +78,10 @@
    @ApiModelProperty(value = "基础附件")
    private List<FileVo> fileBaseList;

    @ApiModelProperty(value = "重点任务类型")
    private Integer keyPoint;


    public Allocation convert() {
        Allocation allocation = BeanConverts.convert(this, Allocation.class);
        return allocation;