From 811e8e7139ad6e331c2f84bcd5cf3f927a8b3312 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 15 五月 2021 18:22:57 +0800
Subject: [PATCH] Merge https://gitee.com/wuxw7/MicroCommunity
---
java110-bean/src/main/java/com/java110/entity/merchant/BoMerchant.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/entity/merchant/BoMerchant.java b/java110-bean/src/main/java/com/java110/entity/merchant/BoMerchant.java
index fda3860..726c27b 100755
--- a/java110-bean/src/main/java/com/java110/entity/merchant/BoMerchant.java
+++ b/java110-bean/src/main/java/com/java110/entity/merchant/BoMerchant.java
@@ -10,7 +10,7 @@
* 瀵瑰簲鍟嗘埛 杩囩▼琛� bo_merchant
* Created by wuxw on 2017/5/20.
*/
-public class BoMerchant extends DefaultBoEntity implements Comparable{
+public class BoMerchant extends DefaultBoEntity implements Comparable<BoMerchant>{
private String boId;
@@ -149,9 +149,8 @@
* @return
*/
@Override
- public int compareTo(Object o) {
+ public int compareTo(BoMerchant otherBoMerchant) {
- BoMerchant otherBoMerchant = (BoMerchant)o;
if("DEL".equals(this.getState()) && "ADD".equals(otherBoMerchant.getState())) {
return -1;
}
--
Gitblit v1.8.0