Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~hades/design into release/10.0

designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java

@@ -44,7 +44,7 @@ public class VanChartFunnelSeriesPane extends VanChartAbstractPlotSeriesPane {
     //设置色彩面板内容
     protected void setColorPaneContent (JPanel panel) {
         if (stylePane != null) {
-            panel.add(createStylePane(), BorderLayout.CENTER);
+            panel.add(stylePane, BorderLayout.CENTER);
         }
         panel.add(createAlphaPane(), BorderLayout.SOUTH);
     }