修复boxplot在生成json时出现itemStyle重复定义

wangchuan2008888 · wangchuan2008888 · commit 22353a3c95fe · 2016-12-07T19:18:59.000+08:00
diff --git a/src/main/java/com/github/abel533/echarts/series/Boxplot.java b/src/main/java/com/github/abel533/echarts/series/Boxplot.java
@@ -45,7 +45,8 @@ public class Boxplot extends Series<Boxplot> {
     /**
      * boxplot &#22270;&#24418;&#26679;&#24335;&#65292;&#26377; normal &#21644; emphasis &#20004;&#20010;&#29366;&#24577;&#65292;normal &#26159;&#22270;&#24418;&#27491;&#24120;&#30340;&#26679;&#24335;&#65292;emphasis &#26159;&#22270;&#24418;&#39640;&#20142;&#30340;&#26679;&#24335;&#65292;&#27604;&#22914;&#40736;&#26631;&#24748;&#28014;&#25110;&#32773;&#22270;&#20363;&#32852;&#21160;&#39640;&#20142;&#30340;&#26102;&#20505;&#20250;&#20351;&#29992; emphasis &#20316;&#20026;&#22270;&#24418;&#30340;&#26679;&#24335;
      */
-    private ItemStyle itemStyle;
+    //private ItemStyle itemStyle;
+    //&#22312;Gson&#29983;&#25104;json&#26102;&#20250;&#20986;&#29616;&#35813;&#25104;&#21592;&#21464;&#37327;&#37325;&#22797;&#23450;&#20041;&#30340;&#38382;&#39064;
 
     /**
      * &#26500;&#36896;&#20989;&#25968;
diff --git a/src/main/java/com/github/abel533/echarts/series/Series.java b/src/main/java/com/github/abel533/echarts/series/Series.java
@@ -77,7 +77,7 @@ public abstract class Series<T> extends AbstractData<T> implements Chart {
      *
      * @see com.github.abel533.echarts.style.ItemStyle
      */
-    private ItemStyle itemStyle;
+    protected ItemStyle itemStyle;
     /**
      * &#26631;&#27880;
      *

-Original file line number
+Diff line change
     /**
      * boxplot 图形样式，有 normal 和 emphasis 两个状态，normal 是图形正常的样式，emphasis 是图形高亮的样式，比如鼠标悬浮或者图例联动高亮的时候会使用 emphasis 作为图形的样式
      */
 -    private ItemStyle itemStyle;
 +    //private ItemStyle itemStyle;
 +    //在Gson生成json时会出现该成员变量重复定义的问题
     /**
      * 构造函数
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public abstract class Series<T> extends AbstractData<T> implements Chart {`
`77`	`77`	`*`
`78`	`78`	`* @see com.github.abel533.echarts.style.ItemStyle`
`79`	`79`	`*/`
`80`		`- private ItemStyle itemStyle;`
	`80`	`+ protected ItemStyle itemStyle;`
`81`	`81`	`/**`
`82`	`82`	`* 标注`
`83`	`83`	`*`