Merge pull request #12838 from ulleo/dev-v2

fix(X-Pack): 修复数据填报任务过滤数据下发会有NPE错误的问题
This commit is contained in:
ulleo 2024-10-23 10:35:00 +08:00 committed by GitHub
commit 97e4762c00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 1 deletions

@ -1 +1 @@
Subproject commit e35f46852c16791387a3985c56f429088bf0ffe9
Subproject commit e97268fa5666ebba702953d86be58a3ca34cf604

View File

@ -0,0 +1,27 @@
package io.dataease.api.xpack.dataFilling.dto;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
@Data
public class FilterSetting implements Serializable {
@Serial
private static final long serialVersionUID = -3292560414617242094L;
private String column;
private Object value;
private List<String> valueList;
private BigDecimal min;
private BigDecimal max;
private boolean number;
private boolean date;
private String dateType;
private String filterType;
private String term;
private boolean multiple;
private String type;
}