Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-12-01 ac832618393aca09f81d6bd04117e0cdb32301c3

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

@@ -66,6 +66,10 @@
    private Integer state;


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


    @ApiModelProperty(value = "基础附件")
    private List<FileVo> fileBaseList;