Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/jFrameWork.git into dev

jfwAptOrm/src/main/java/org/jfw/apt/orm/core/enums/DE.java

@@ -18,8 +18,8 @@ public enum DE {
	int_de(IntHandler.class, "INTEGER", false,true,true,true,null,null),
	Int_de(WIntHandler.class,"INTEGER",true,true,true,true,null,null),
	
	long_de(LongHandler.class, "LONG", false,true,true,true,null,null),
	Long_de(WLongHandler.class,"LONG",true,true,true,true,null,null),
	long_de(LongHandler.class, "BIGINT", false,true,true,true,null,null),
	Long_de(WLongHandler.class,"BIGINT",true,true,true,true,null,null),
	
	float_de(FloatHandler.class, "FLOAT",false,true,true,true,null,null),
	Float_de(WFloatHandler.class, "FLOAT",true,true,true,true,null,null),
@@ -31,6 +31,9 @@ public enum DE {
	string_de(StringHandler.class, "VARCHAR(255)",false,true,true,true,null,null),
	String_de(StringHandler.class, "VARCHAR(255)",true,true,true,true,null,null),
	
	text_de(StringHandler.class, "TEXT",false,true,true,true,null,null),
	Text_de(StringHandler.class, "TEXT",true,true,true,true,null,null),
	
	string_de2(StringHandler.class, "VARCHAR(255)",false,true,true,true,null,null),
	String_de2(StringHandler.class, "VARCHAR(255)",true,true,true,true,null,null),