合并异常

src/main/java/com/baomidou/mybatisplus/toolkit/GlobalConfigUtils.java

@@ -194,8 +194,5 @@ public class GlobalConfigUtils {
             throw new MybatisPlusException("Error: GlobalConfigUtils setMetaData Fail !  Cause:" + e);
         }
     }
-<<<<<<< HEAD
-=======
 
->>>>>>> dev
 }

src/main/java/com/baomidou/mybatisplus/toolkit/StringUtils.java

@@ -643,30 +643,17 @@ public class StringUtils {
         char[] chars = input.toCharArray();
         for (int i = 0; i < chars.length; i++) {
             char c = chars[i];
-<<<<<<< HEAD
-            boolean isUpperCaseAndPreviousIsUpperCase = (Character.isUpperCase(previousChar)) && (Character.isUpperCase(
-                    c));
-            boolean isUpperCaseAndPreviousIsLowerCase = (Character.isLowerCase(previousChar)) && (Character.isUpperCase(
-                    c));
-=======
             boolean isUpperCaseAndPreviousIsUpperCase = (Character.isUpperCase(previousChar)) && (Character.isUpperCase(c));
             boolean isUpperCaseAndPreviousIsLowerCase = (Character.isLowerCase(previousChar)) && (Character.isUpperCase(c));
->>>>>>> dev
 
             boolean previousIsWhitespace = Character.isWhitespace(previousChar);
             boolean lastOneIsNotUnderscore = (buf.length() > 0) && (buf.charAt(buf.length() - 1) != '_');
             boolean isNotUnderscore = c != '_';
-<<<<<<< HEAD
-            if ((lastOneIsNotUnderscore) && ((isUpperCaseAndPreviousIsLowerCase) || (previousIsWhitespace) || ((_betweenUpperCases) && (containsLowerCase) && (isUpperCaseAndPreviousIsUpperCase)))) {
-                buf.append("_");
-            } else if (((separatorAfterDigit) && (Character.isDigit(previousChar)) && (Character.isLetter(c))) || ((separatorBeforeDigit) && (Character
-=======
             if ((lastOneIsNotUnderscore) && ((isUpperCaseAndPreviousIsLowerCase) || (previousIsWhitespace) || ((_betweenUpperCases)
                     && (containsLowerCase) && (isUpperCaseAndPreviousIsUpperCase)))) {
                 buf.append("_");
             } else if (((separatorAfterDigit) && (Character.isDigit(previousChar))
                     && (Character.isLetter(c))) || ((separatorBeforeDigit) && (Character
->>>>>>> dev
                     .isDigit(c)) && (Character.isLetter(previousChar)))) {
                 buf.append('_');
             }
@@ -683,11 +670,7 @@ public class StringUtils {
         return buf.toString();
     }
 
-<<<<<<< HEAD
     public static boolean containsLowerCase(String s) {
-=======
-    public static boolean containsLowerCase ( String s ) {
->>>>>>> dev
         for (char c : s.toCharArray()) {
             if (Character.isLowerCase(c)) {
                 return true;
@@ -696,22 +679,10 @@ public class StringUtils {
         return false;
     }
 
-<<<<<<< HEAD
     private static boolean shouldReplace(char c) {
         return (c == '.') || (c == '_') || (c == '-');
     }
 
-    private static String wordsToHyphenCase(String s) {
-        StringBuilder buf = new StringBuilder();
-        char lastChar = 'a';
-        for (char c : s.toCharArray()) {
-            if ((Character.isWhitespace(lastChar)) && (!Character.isWhitespace(c)) && ('-' != c) && (buf.length() > 0) && (buf
-                    .charAt(buf.length() - 1) != '-')) {
-=======
-    private static boolean shouldReplace ( char c ) {
-        return (c == '.') || (c == '_') || (c == '-');
-    }
-
     private static String wordsToHyphenCase ( String s ) {
         StringBuilder buf = new StringBuilder();
         char lastChar = 'a';
@@ -719,7 +690,6 @@ public class StringUtils {
             if ((Character.isWhitespace(lastChar)) && (!Character.isWhitespace(c))
                     && ('-' != c) && (buf.length() > 0)
                     && (buf.charAt(buf.length() - 1) != '-')) {
->>>>>>> dev
                 buf.append("-");
             }
             if ('_' == c) {

src/test/java/com/baomidou/mybatisplus/test/GlobalConfigurationTest.java

@@ -50,10 +50,7 @@ public class GlobalConfigurationTest {
     @SuppressWarnings("unchecked")
     public static void main(String[] args) {
         GlobalConfiguration global = GlobalConfigUtils.defaults();
-<<<<<<< HEAD
-=======
         // global.setAutoSetDbType(true);
->>>>>>> dev
         // 设置全局校验机制为FieldStrategy.Empty
         global.setFieldStrategy(2);
         BasicDataSource dataSource = new BasicDataSource();

src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java

@@ -15,14 +15,11 @@
  */
 package com.baomidou.mybatisplus.test.generator;
 
-<<<<<<< HEAD
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-=======
 import java.util.Arrays;
 import java.util.HashMap;
->>>>>>> dev
 import java.util.Map;
 
 import com.baomidou.mybatisplus.generator.AutoGenerator;