Merge branch 'dev_qc685_状态拆分' into test6.8.5

@@ -12,7 +12,7 @@
     <result column="create_time" jdbcType="INTEGER" property="createTime" />
     <result column="create_time" jdbcType="INTEGER" property="createTime" />
     <result column="express_type" jdbcType="TINYINT" property="expressType" />
     <result column="express_type" jdbcType="TINYINT" property="expressType" />
     <result column="state" jdbcType="INTEGER" property="state" />
     <result column="state" jdbcType="INTEGER" property="state" />
-    <result column="data_type" jdbcType="TINYINT" property="dataType" />
+    <result column="data_type" jdbcType="INTEGER" property="dataType" />
     <result column="operate_transfer_code" jdbcType="INTEGER" property="operateTransferCode" />
     <result column="operate_transfer_code" jdbcType="INTEGER" property="operateTransferCode" />
   </resultMap>
   </resultMap>
   <sql id="Base_Column_List">
   <sql id="Base_Column_List">
@@ -39,7 +39,7 @@
     values (#{uid,jdbcType=INTEGER}, #{orderCode,jdbcType=BIGINT}, #{waybillCode,jdbcType=VARCHAR}, 
     values (#{uid,jdbcType=INTEGER}, #{orderCode,jdbcType=BIGINT}, #{waybillCode,jdbcType=VARCHAR}, 
       #{acceptAddress,jdbcType=VARCHAR}, #{acceptRemark,jdbcType=VARCHAR}, #{logisticsType,jdbcType=INTEGER}, 
       #{acceptAddress,jdbcType=VARCHAR}, #{acceptRemark,jdbcType=VARCHAR}, #{logisticsType,jdbcType=INTEGER}, 
       #{createTime,jdbcType=INTEGER}, #{expressType,jdbcType=TINYINT}, #{state,jdbcType=INTEGER}
       #{createTime,jdbcType=INTEGER}, #{expressType,jdbcType=TINYINT}, #{state,jdbcType=INTEGER}
-      , #{dataType,jdbcType=TINYINT}, #{operateTransferCode,jdbcType=INTEGER}
+      , #{dataType,jdbcType=INTEGER}, #{operateTransferCode,jdbcType=INTEGER}
       )
       )
   </insert>
   </insert>
   <!--
   <!--