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

jinpengyong

2023-10-27 54c0125835e850b97793601ac45ee62fa1c4b12e

 screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java

@@ -38,6 +38,8 @@

    @ApiModelProperty(value = "整改类型id")
    private Integer changeType;
    @ApiModelProperty(value = "污染位置")
    private String pollutePosition;

    @ApiModelProperty(value = "期限天数")
    private Integer changeDay;