From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java
index 0f4058b..0087b3b 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java
@@ -18,7 +18,7 @@
}
public static List<OrderItem> ascs(String... columns) {
- List<OrderItem> orderItems = new ArrayList<>();
+ List<OrderItem> orderItems = new ArrayList<OrderItem>();
for (String column : columns) {
orderItems.add(asc(column));
}
@@ -27,7 +27,7 @@
}
public static List<OrderItem> descs(String... columns) {
- List<OrderItem> orderItems = new ArrayList<>();
+ List<OrderItem> orderItems = new ArrayList<OrderItem>();
for (String column : columns) {
orderItems.add(desc(column));
}
@@ -55,7 +55,7 @@
this.asc = asc;
}
- public boolean equals(final Object o) {
+ /*public boolean equals(final Object o) {
if (o == this) {
return true;
} else if (!(o instanceof OrderItem)) {
@@ -80,11 +80,11 @@
return true;
}
}
- }
+ }*/
- protected boolean canEqual(final Object other) {
+/* protected boolean canEqual(final Object other) {
return other instanceof com.baomidou.mybatisplus.core.metadata.OrderItem;
- }
+ }*/
public int hashCode() {
int result = 1;
--
Gitblit v1.9.3