Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/syc/slm/slmbi/dto/VariableHistoryDataDTO.java

@@ -35,5 +35,5 @@ public class VariableHistoryDataDTO {
     private String format;
 
     @ApiModelProperty(value = "key 为变量id value 为变量名称", required = true)
-    Map<String,String> variables;
+    private Map<String,String> variables;
 }

src/main/java/com/syc/slm/slmbi/dto/VariableRealTimeDTO.java

@@ -25,9 +25,11 @@ public class VariableRealTimeDTO {
     private String startTime;
     @ApiModelProperty(value = "结束时间(时间戳)", required = true)
     private String endTime;
-    @ApiModelProperty(value = "请填时间格式如(yyyy-MM-dd HH:mm:ss)", required = true)
+    @ApiModelProperty(value = "(如果x轴为变量直接填yyyy-MM-dd HH:mm:ss）请填时间格式如(yyyy-MM-dd HH:mm:ss)", required = true)
     private String format;
 
     @ApiModelProperty(value = "key 为变量id value 为变量名称", required = true)
-    Map<String,String> variables;
+    private Map<String,String> variables;
+    @ApiModelProperty(value = "统计维度，如果是时间填time,如果是变量填variableCode", required = true)
+    private String x;
 }