Merge branch 'develop' of https://git.okayapps.com/java-sunac-report/sunac_report into develop

src/main/resources/mappings/modules/report/CtBbtcBusCategoryDao.xml

@@ -4,7 +4,7 @@
     
 	<sql id="ctBbtcBusCategoryColumns">
 		a.id AS "id",
-		a.number AS "number",
+		a.fnumber AS "number",
 		a.name AS "name",
 		a.type AS "type.id",
 		b.name AS "typeName",
@@ -75,7 +75,7 @@
 	<insert id="insert">
 		INSERT INTO ct_bbtc_bus_category(
 			id,
-			number,
+			fnumber,
 			name,
 			type,
 			ctBbtcGroup
@@ -90,7 +90,7 @@
 	
 	<update id="update">
 		UPDATE ct_bbtc_bus_category SET 	
-			number = #{number},
+			fnumber = #{number},
 			name = #{name},
 			type = #{type.id},
 			ctBbtcGroup=#{ctBbtcGroup}

src/main/resources/mappings/modules/report/CtBbtcBusTypeDao.xml

@@ -4,7 +4,7 @@
     
 	<sql id="ctBbtcBusTypeColumns">
 		a.id AS "id",
-		a.number AS "number",
+		a.fnumber AS "number",
 		a.name AS "name",
 		a.supplement_group AS "group",
 		b.label AS "groupName"
@@ -74,7 +74,7 @@
 	<insert id="insert">
 		INSERT INTO ct_bbtc_bus_type(
 			id,
-			number,
+			fnumber,
 			name,
 			supplement_group
 		) VALUES (
@@ -87,7 +87,7 @@
 	
 	<update id="update">
 		UPDATE ct_bbtc_bus_type SET 	
-			number = #{number},
+			fnumber = #{number},
 			name = #{name},
 			supplement_group = #{group}
 		WHERE id = #{id}

src/main/resources/mappings/modules/report/CtBbtcRegionDao.xml

@@ -4,7 +4,7 @@
     
 	<sql id="ctBbtcRegionColumns">
 		a.id AS "id",
-		a.number AS "number",
+		a.fnumber AS "number",
 		a.name AS "name",
 		a.supplement_group AS "group",
 		b.label AS "groupName"
@@ -76,7 +76,7 @@
 	<insert id="insert">
 		INSERT INTO ct_bbtc_region(
 			id,
-			number,
+			fnumber,
 			name,
 			supplement_group
 		) VALUES (
@@ -89,7 +89,7 @@
 	
 	<update id="update">
 		UPDATE ct_bbtc_region SET 	
-			number = #{number},
+			fnumber = #{number},
 			name = #{name},
 			supplement_group = #{group}
 		WHERE id = #{id}