提交 c8564bb0 编写于 作者: sq3536's avatar sq3536

Merge remote-tracking branch 'origin/master'

...@@ -5,6 +5,7 @@ import cn.ibizlab.util.dict.Catalog; ...@@ -5,6 +5,7 @@ import cn.ibizlab.util.dict.Catalog;
import cn.ibizlab.util.dict.CodeItem; import cn.ibizlab.util.dict.CodeItem;
import cn.ibizlab.util.dict.Option; import cn.ibizlab.util.dict.Option;
import cn.ibizlab.util.helper.DataObject; import cn.ibizlab.util.helper.DataObject;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
...@@ -46,6 +47,7 @@ public class FetchParam { ...@@ -46,6 +47,7 @@ public class FetchParam {
", displayType='" + displayType + '\'' + ", displayType='" + displayType + '\'' +
", dimDict='" + dimDict + '\'' + ", dimDict='" + dimDict + '\'' +
", dimValues=" + dimValues + ", dimValues=" + dimValues +
", dimItems=" + JSONObject.toJSONString(dimItems )+
", dimValue='" + dimValue + '\'' + ", dimValue='" + dimValue + '\'' +
", includeChild=" + includeChild + ", includeChild=" + includeChild +
", metricIds=" + metricIds + ", metricIds=" + metricIds +
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册