From 83f164eaf88182d89c6a13446f8af08e297f1677 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 23 Jul 2019 16:02:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=94=B5=E8=A1=A8=E5=8D=8F=E8=AE=AE=E7=9A=84=E6=96=87=E5=AD=97?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/device/KwMeterController.java | 2 +- .../src/main/java/com/iformall/domain/po/KwMeter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index 01b9dc4f6..3b6dac8d1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -248,7 +248,7 @@ public class KwMeterController extends BaseController { meter1.setPlace("1栋-3楼-2号电井"); meter1.setBrand("人民电器"); meter1.setModel("DS866"); - meter1.setProtocol(0); + meter1.setProtocol(1); meter1.setBandrate(1200); meter1.setBoxImei("865501040775810"); meter1.setMerchantName("富茂旗舰店"); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index 669ee3b82..b70ec69bc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -54,7 +54,7 @@ public class KwMeter extends BaseEntity { private String model; @Excel(name = "协议(0,1-97协议,07协议)", width =30, orderNum = "5") - @io.swagger.annotations.ApiModelProperty(value = "协议(0,97协议)(1,07协议)", name = "protocol") + @io.swagger.annotations.ApiModelProperty(value = "协议(0,1,2-AUTO,97,07协议)", name = "protocol") private Integer protocol; @Excel(name = "波特率(1200,2400,9600)", width = 30, orderNum = "6")