Merge branch 'fix/queryentity0729#227' into 'develop'

数据统计图表类型无法保存

See merge request o2oa/o2oa!1287

o2server/x_query_core_express/src/main/java/com/x/query/core/express/plan/Calculate.java

@@ -43,7 +43,10 @@ public class Calculate extends GsonPropertyObject {
 	public String groupMergeType;
 
 	public List<CalculateEntry> calculateList;
-
+	
+	@FieldDescribe("图表")
+	public List<String> chart;
+	
 	public Boolean available() {
 		for (CalculateEntry o : ListTools.nullToEmpty(this.calculateList)) {
 			if (o.available()) {