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

jinpengyong

2023-10-25 02a6c170797c5d2750ed07b21f22396a7683c54e

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

@@ -45,7 +45,7 @@
    private String changeName;

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

    @ApiModelProperty(value = "整改附件")