Merge branch 'master' of shine/demo-show-echarts into master

src/main/java/com/fr/solution/plugin/chart/echarts/common/data/NormalEChartsColumnFieldCollection.java

@@ -2,7 +2,7 @@ package com.fr.solution.plugin.chart.echarts.common.data;
 
 import com.fr.chartx.data.annotations.KeyField;
 import com.fr.chartx.data.field.ColumnField;
-import com.fr.chartx.data.field.diff.AbstractColumnFieldCollectionWithSeriesValue;
+import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue;
 
 /**
  * @author shine
@@ -11,7 +11,7 @@ import com.fr.chartx.data.field.diff.AbstractColumnFieldCollectionWithSeriesValu
  * <p>
  * 分类、系列、值三个字段
  */
-public class NormalEChartsColumnFieldCollection extends AbstractColumnFieldCollectionWithSeriesValue {
+public class NormalEChartsColumnFieldCollection extends ColumnFieldCollectionWithSeriesValue {
 
     @KeyField
     private ColumnField category = new ColumnField();