Merge remote-tracking branch 'origin/master' into test

device-api/src/main/java/com/xy/dto/MercMiniSalseCountDto.java

@@ -76,11 +76,11 @@ public class MercMiniSalseCountDto {
     @Accessors(chain = true)
     public static class DayDTO {
 
-        @ApiModelProperty(value = "日期", required = false, hidden = true)
+        @ApiModelProperty(value = "日期", required = false)
         @JsonFormat(pattern = "yyyy-MM-dd")
         private DateTime date;
 
-        @ApiModelProperty(value = "商户ID", required = false, hidden = true)
+        @ApiModelProperty(value = "商户ID", required = false)
         private Long mercId;
     }