Merge branch 'master' into jfinal-java8

src/main/java/com/jfinal/plugin/activerecord/TableBuilder.java

@@ -99,7 +99,7 @@ class TableBuilder {
 					table.setColumnType(colName, java.sql.Date.class);
 				}
 				// 支持 PostgreSql 的 jsonb json
-				else if (type == Types.JAVA_OBJECT) {
+				else if (type == Types.OTHER) {
 					table.setColumnType(colName, Object.class);
 				}
 				else {

src/main/java/com/jfinal/plugin/activerecord/generator/MetaBuilder.java

@@ -254,7 +254,7 @@ public class MetaBuilder {
 					typeStr = "java.util.Date";
 				}
 				// 支持 PostgreSql 的 jsonb json
-				else if (type == Types.JAVA_OBJECT) {
+				else if (type == Types.OTHER) {
 					typeStr = "java.lang.Object";
 				} else {
 					typeStr = "java.lang.String";