Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-11-07 54beb665319b66742cdec3dffb7e298701d61582

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

@@ -72,6 +72,7 @@
    private String problemDescribe;

    @ApiModelProperty(value = "状态")
    @NotNull(message = "状态不能为空！")
    private Integer state;

    @ApiModelProperty(value = "基础附件")