Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java

@@ -439,7 +439,7 @@ public class BlockReportEnumUtil {
                 }else if(type.equals(TEMPLATE_TYPE.ECHARTS_BAR)){       // 饼图  只需要名称 和值
                     return new String[]{"name","value"};
                 }else if(type.equals(TEMPLATE_TYPE.ECHARTS_LINE)){       // 饼图  只需要名称 和值
-                    return new String[]{"name","value","xAxis"};
+                    return new String[]{"xAxis","name","value"};
                 }else if(type.equals(TEMPLATE_TYPE.ECHARTS_TREEMAP)){       // 饼图  只需要名称 和值
                     return new String[]{"name","value"};
                 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -1048,8 +1048,6 @@ public class ImppEnumUtil {
         }
     }
 
-    //messageReceiverType
-
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MESSAGE_RECEIVER_TYPE {
         INTERNAL(1, "内部人员接收"),

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java

@@ -89,6 +89,11 @@ public class BrPojoAttr extends BaseBean {
     @ApiParam(value ="聚合类型",example = "-1")
     private Integer aggregationType;
 
+    @Column(name="AGGREGATION_ID")
+    @ApiParam(value ="聚合类型",example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long aggregationId;
+
     @Column(name="ATTR_SORT")
     @ApiParam(value ="字段排序")
     private Integer attrSort;