resolve conflict

This commit is contained in:
Francis Dong
2021-05-13 16:13:54 +08:00
parent 6f4796cc44
commit 3ebc187360

View File

@@ -35,9 +35,6 @@ import we.util.MapUtil;
*/
public class PathMapping {
private static List<String> typeList = Arrays.asList("Integer", "int", "Boolean", "boolean", "Float", "float",
"Double", "double", "String", "string", "Long", "long", "Number", "number");
private static List<String> typeList = Arrays.asList("Integer", "int", "Boolean", "boolean", "Float", "float",
"Double", "double", "String", "string", "Long", "long", "Number", "number");