From eba78ba8fec77a2781444d27098a5ea78512635b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 12 六月 2021 00:35:12 +0800
Subject: [PATCH] 加入报表工鞥呢
---
java110-bean/src/main/java/com/java110/entity/merchant/BoMerchantAttr.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/entity/merchant/BoMerchantAttr.java b/java110-bean/src/main/java/com/java110/entity/merchant/BoMerchantAttr.java
index 4a0234d..4ac7114 100755
--- a/java110-bean/src/main/java/com/java110/entity/merchant/BoMerchantAttr.java
+++ b/java110-bean/src/main/java/com/java110/entity/merchant/BoMerchantAttr.java
@@ -9,7 +9,7 @@
* 鍟嗘埛灞炴�ц〃 bo_merchant_type
* Created by wuxw on 2017/5/20.
*/
-public class BoMerchantAttr extends DefaultBoAttrEntity implements Comparable {
+public class BoMerchantAttr extends DefaultBoAttrEntity implements Comparable<BoMerchantAttr> {
private String boId;
@@ -86,8 +86,7 @@
}
@Override
- public int compareTo(Object o) {
- BoMerchantAttr otherBoMerchant = (BoMerchantAttr)o;
+ public int compareTo(BoMerchantAttr otherBoMerchant) {
if("DEL".equals(this.getState()) && "ADD".equals(otherBoMerchant.getState())) {
return -1;
}
--
Gitblit v1.8.0