Commit cfecfb79 authored by simon824's avatar simon824
Browse files

1. change windows new line 'CR' to linux new line 'LF'

2. solve conflict
parent 65841a57
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class JSONUtils {
     */
    public static <T> List<T> toList(String json, Class<T> clazz) {
        if (StringUtils.isEmpty(json)) {
            return new ArrayList<>();
            return Collections.emptyList();
        }

        try {
@@ -130,7 +130,7 @@ public class JSONUtils {
            logger.error("parse list exception!", e);
        }

        return new ArrayList<>();
        return Collections.emptyList();
    }