Merge remote-tracking branch 'origin/remote_dev' into remote_dev

src/main/webapp/WEB-INF/classes/efile/EFILE1010/cloumn_code_query.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0
     $Purpose:
 -->
-<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="E_ARCHIVES_DEFINE_DATA" defaultOrderBy="cloumn_code"
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="E_ARCHIVES_DEFINE_DATA" defaultOrderBy="cloumn_code">
     <bm:fields>
         <bm:field name="base_archive_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BASE_ARCHIVE_ID" />
         <bm:field name="sture_data_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="STURE_DATA_ID" />