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

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

@@ -218,6 +218,8 @@ public class MercMiniDeviceDto {
     @Data
     @Accessors(chain = true)
     public static class DayCountVO {
+        @ApiModelProperty(name = "订单总成本价")
+        private Integer orderTotalPriceCost;
 
         @ApiModelProperty("订单数")
         private Integer orderNum;