Merge branch 'hcp' into test

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

@@ -70,6 +70,9 @@ public class MercMiniSalseCountDto {
         @ApiModelProperty(value = "日期", required = false)
         @JsonFormat(pattern = "yyyy-MM")
         private DateTime date;
+
+        @ApiModelProperty(value = "商户ID")
+        private Long mercId;
     }
 
     @Data