修正字符

HbnKing · HbnKing · commit 0736bb173f86 · 2024-02-05T10:26:06.000+08:00
diff --git a/mars-core/src/main/java/com/whaleal/mars/core/query/Query.java b/mars-core/src/main/java/com/whaleal/mars/core/query/Query.java
@@ -290,7 +290,7 @@ public Query with( Pageable pageable) {
         }
 
         if(pageable.getSort().isSorted() &&  sorts.isSorted()){
-            LOGGER.warn(" Sorts are  conflct in Query and Pageable , will use Page sorts first ");
+            LOGGER.warn(" Sorts are  conflict in Query and Pageable , will use Page sorts first ");
         }
 
         if( pageable.getSort().isSorted() ){
@@ -320,7 +320,7 @@ public Query page( Pageable pageable) {
         }
 
         if(pageable.getSort().isSorted() &&  sorts.isSorted()){
-            LOGGER.warn(" Sorts are  conflct in Query and Pageable , will use Page sorts first ");
+            LOGGER.warn(" Sorts are  conflict in Query and Pageable , will use Page sorts first ");
         }
 
         if( pageable.getSort().isSorted() ){

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ public Query with( Pageable pageable) {`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`if(pageable.getSort().isSorted() && sorts.isSorted()){`
`293`		`- LOGGER.warn(" Sorts are conflct in Query and Pageable , will use Page sorts first ");`
	`293`	`+ LOGGER.warn(" Sorts are conflict in Query and Pageable , will use Page sorts first ");`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`if( pageable.getSort().isSorted() ){`
`@@ -320,7 +320,7 @@ public Query page( Pageable pageable) {`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`if(pageable.getSort().isSorted() && sorts.isSorted()){`
`323`		`- LOGGER.warn(" Sorts are conflct in Query and Pageable , will use Page sorts first ");`
	`323`	`+ LOGGER.warn(" Sorts are conflict in Query and Pageable , will use Page sorts first ");`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`if( pageable.getSort().isSorted() ){`