Commit 3ea041c8 authored by yanzg's avatar yanzg

常规BUG的修改

parent f0addf73
...@@ -195,6 +195,10 @@ public class DaoConst { ...@@ -195,6 +195,10 @@ public class DaoConst {
*/ */
public static final String[] LAST = new String[]{"{WHERE}", "{GROUP}", "{HAVING}", "{ORDER}", "{LIMIT}"}; public static final String[] LAST = new String[]{"{WHERE}", "{GROUP}", "{HAVING}", "{ORDER}", "{LIMIT}"};
/**
* 普通字段
*/
public static final int FIELD_NONE = -1;
/** /**
* 普通字段 * 普通字段
*/ */
......
...@@ -24,5 +24,5 @@ public @interface TableAnnotation { ...@@ -24,5 +24,5 @@ public @interface TableAnnotation {
* 字段类型 * 字段类型
* @return * @return
*/ */
int type() default DaoConst.FIELD_COMMON; int type() default DaoConst.FIELD_NONE;
} }
...@@ -141,7 +141,7 @@ public class TableStruct { ...@@ -141,7 +141,7 @@ public class TableStruct {
* @return 最终类型 * @return 最终类型
*/ */
private int getActionType(int fieldAction, int stringAction) { private int getActionType(int fieldAction, int stringAction) {
if (fieldAction != DaoConst.FIELD_COMMON) { if (fieldAction != DaoConst.FIELD_NONE) {
return fieldAction; return fieldAction;
} else { } else {
return stringAction; return stringAction;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment