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 @@