From a8d5676246cf8100c8bdd17ab39a0e2bc497d357 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 18 Jul 2019 20:16:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E7=94=B5=E8=A1=A8=E5=95=86=E6=88=B7=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/KwMerchantMeter.java | 1 + .../src/main/java/com/iformall/domain/po/KwMeter.java | 3 +++ .../src/main/resources/mapper/KwMerchantMeterMapper.xml | 2 +- mallinkService/src/main/resources/mapper/KwMeterMapper.xml | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java index dbcc9add9..98713e581 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java @@ -50,6 +50,7 @@ public class KwMerchantMeter extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") private Date updateTime; + public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), 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 5f9f97400..ea1ea75db 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -77,6 +77,9 @@ public class KwMeter extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "状态0绑定1未绑定", name = "bindStatus") private Integer bindStatus; + @Transient + private Integer merchantMeterStatus; + @Transient protected KwMeterData latestRecord; diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index c4a71658a..4d92dd519 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -78,7 +78,7 @@