bug

src/main/java/org/springblade/modules/api/vo/MerchantIncomeVO.java

@@ -62,10 +62,10 @@ public class MerchantIncomeVO  {
     @ApiModelProperty(value = "设备id")
     private Long deviceId;
     /**
-     * 设备id
+     * 设备名称
      */
     @ApiModelProperty(value = "设备名称")
-    private Long deviceName;
+    private String deviceName;
     /**
      * 商家id
      */