Merge branch 'master' of github.com:JavaWebStack/ORM

Author: JulianFun123

src/main/java/org/javawebstack/orm/TableInfo.java

@@ -59,8 +59,8 @@ public TableInfo(Class<? extends Model> model, ORMConfig config) throws ORMConfi
             String fieldName = field.getName();
             fieldNames.add(fieldName);
             Column fieldConfig = field.getDeclaredAnnotationsByType(Column.class)[0];
-            if(fieldConfig.column().length() > 0){
-                fieldToColumn.put(fieldName, fieldConfig.column());
+            if(fieldConfig.name().length() > 0){
+                fieldToColumn.put(fieldName, fieldConfig.name());
             }else{
                 fieldToColumn.put(fieldName, config.isCamelToSnakeCase()?Helper.toSnakeCase(fieldName):fieldName);
             }

src/main/java/org/javawebstack/orm/annotation/Column.java

@@ -13,6 +13,6 @@
     boolean id() default false;
     boolean ai() default true;
     KeyType key() default KeyType.NONE;
-    String column() default "";
+    String name() default "";
     int size() default -1;
 }