dao|dao层重新生成

@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.bi;
 
 import com.fedex.connect.common.model.bi.PortclearEmailMapping;
 import com.fedex.connect.common.model.bi.PortclearEmailMappingExample;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface PortclearEmailMappingMapper {
     long countByExample(PortclearEmailMappingExample example);

@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.log;
 
 import com.fedex.connect.common.model.log.EmailHistory;
 import com.fedex.connect.common.model.log.EmailHistoryExample;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface EmailHistoryMapper {
     long countByExample(EmailHistoryExample example);

@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.log;
 
 import com.fedex.connect.common.model.log.UserLoginInfo;
 import com.fedex.connect.common.model.log.UserLoginInfoExample;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface UserLoginInfoMapper {
     long countByExample(UserLoginInfoExample example);

@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.sys;
 
 import com.fedex.connect.common.model.sys.Privilege;
 import com.fedex.connect.common.model.sys.PrivilegeExample;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface PrivilegeMapper {
     long countByExample(PrivilegeExample example);

-package com.fedex.connect.common.dao.sys;
-
-import com.fedex.connect.common.model.sys.RedisSlab;
-import com.fedex.connect.common.model.sys.RedisSlabExample;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface RedisSlabMapper {
-    long countByExample(RedisSlabExample example);
-
-    int deleteByExample(RedisSlabExample example);
-
-    int deleteByPrimaryKey(Long id);
-
-    int insert(RedisSlab record);
-
-    int insertSelective(RedisSlab record);
-
-    List<RedisSlab> selectByExample(RedisSlabExample example);
-
-    RedisSlab selectByPrimaryKey(Long id);
-
-    int updateByExampleSelective(@Param("record") RedisSlab record, @Param("example") RedisSlabExample example);
-
-    int updateByExample(@Param("record") RedisSlab record, @Param("example") RedisSlabExample example);
-
-    int updateByPrimaryKeySelective(RedisSlab record);
-
-    int updateByPrimaryKey(RedisSlab record);
-}
\ No newline at end of file

@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.sys;
 
 import com.fedex.connect.common.model.sys.Role;
 import com.fedex.connect.common.model.sys.RoleExample;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface RoleMapper {
     long countByExample(RoleExample example);

+package com.fedex.connect.common.dao.sys;
+
+import com.fedex.connect.common.model.sys.redisSlab;
+import com.fedex.connect.common.model.sys.redisSlabExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface redisSlabMapper {
+    long countByExample(redisSlabExample example);
+
+    int deleteByExample(redisSlabExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(redisSlab record);
+
+    int insertSelective(redisSlab record);
+
+    List<redisSlab> selectByExample(redisSlabExample example);
+
+    redisSlab selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") redisSlab record, @Param("example") redisSlabExample example);
+
+    int updateByExample(@Param("record") redisSlab record, @Param("example") redisSlabExample example);
+
+    int updateByPrimaryKeySelective(redisSlab record);
+
+    int updateByPrimaryKey(redisSlab record);
+}
\ No newline at end of file

@@ -4,12 +4,12 @@
   <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.Attachment">
     <id column="ID" jdbcType="NUMERIC" property="id" />
     <result column="BIZ_ID" jdbcType="NUMERIC" property="bizId" />
-    <result column="BIZ_TYPE_ID" jdbcType="NUMERIC" property="bizTypeId" />
+    <result column="BIZ_TYPE_CODE" jdbcType="VARCHAR" property="bizTypeCode" />
     <result column="BIZ_TYPE_NAME" jdbcType="VARCHAR" property="bizTypeName" />
     <result column="SOURCE_FILE_NAME" jdbcType="VARCHAR" property="sourceFileName" />
     <result column="FILE_NAME" jdbcType="VARCHAR" property="fileName" />
     <result column="FILE_PATH" jdbcType="VARCHAR" property="filePath" />
-    <result column="FILE_TYPE_ID" jdbcType="NUMERIC" property="fileTypeId" />
+    <result column="FILE_TYPE_CODE" jdbcType="VARCHAR" property="fileTypeCode" />
     <result column="FILE_TYPE_NAME" jdbcType="VARCHAR" property="fileTypeName" />
     <result column="STATUS" jdbcType="NUMERIC" property="status" />
     <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
@@ -19,6 +19,7 @@
     <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
     <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
     <result column="UPLOAD_RECORD_ID" jdbcType="NUMERIC" property="uploadRecordId" />
+    <result column="FILE_SIZE" jdbcType="NUMERIC" property="fileSize" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -79,9 +80,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    ID, BIZ_ID, BIZ_TYPE_ID, BIZ_TYPE_NAME, SOURCE_FILE_NAME, FILE_NAME, FILE_PATH, FILE_TYPE_ID, 
-    FILE_TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 
-    MODIFY_USER_ID, MODIFY_USER_NAME, UPLOAD_RECORD_ID
+    ID, BIZ_ID, BIZ_TYPE_CODE, BIZ_TYPE_NAME, SOURCE_FILE_NAME, FILE_NAME, FILE_PATH, 
+    FILE_TYPE_CODE, FILE_TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
+    MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, UPLOAD_RECORD_ID, FILE_SIZE
   </sql>
   <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultMap="BaseResultMap">
     <include refid="OracleDialectPrefix" />
@@ -120,18 +121,20 @@
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
       SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL
     </selectKey>
-    insert into T_BIZ_ATTACHMENT (ID, BIZ_ID, BIZ_TYPE_ID, 
+    insert into T_BIZ_ATTACHMENT (ID, BIZ_ID, BIZ_TYPE_CODE, 
       BIZ_TYPE_NAME, SOURCE_FILE_NAME, FILE_NAME, 
-      FILE_PATH, FILE_TYPE_ID, FILE_TYPE_NAME, 
+      FILE_PATH, FILE_TYPE_CODE, FILE_TYPE_NAME, 
       STATUS, CREATE_TIME, CREATE_USER_ID, 
       CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 
-      MODIFY_USER_NAME, UPLOAD_RECORD_ID)
-    values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizTypeId,jdbcType=NUMERIC}, 
+      MODIFY_USER_NAME, UPLOAD_RECORD_ID, FILE_SIZE
+      )
+    values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizTypeCode,jdbcType=VARCHAR}, 
       #{bizTypeName,jdbcType=VARCHAR}, #{sourceFileName,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, 
-      #{filePath,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=NUMERIC}, #{fileTypeName,jdbcType=VARCHAR}, 
+      #{filePath,jdbcType=VARCHAR}, #{fileTypeCode,jdbcType=VARCHAR}, #{fileTypeName,jdbcType=VARCHAR}, 
       #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 
       #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 
-      #{modifyUserName,jdbcType=VARCHAR}, #{uploadRecordId,jdbcType=NUMERIC})
+      #{modifyUserName,jdbcType=VARCHAR}, #{uploadRecordId,jdbcType=NUMERIC}, #{fileSize,jdbcType=NUMERIC}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Attachment">
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
@@ -143,8 +146,8 @@
       <if test="bizId != null">
         BIZ_ID,
       </if>
-      <if test="bizTypeId != null">
-        BIZ_TYPE_ID,
+      <if test="bizTypeCode != null">
+        BIZ_TYPE_CODE,
       </if>
       <if test="bizTypeName != null">
         BIZ_TYPE_NAME,
@@ -158,8 +161,8 @@
       <if test="filePath != null">
         FILE_PATH,
       </if>
-      <if test="fileTypeId != null">
-        FILE_TYPE_ID,
+      <if test="fileTypeCode != null">
+        FILE_TYPE_CODE,
       </if>
       <if test="fileTypeName != null">
         FILE_TYPE_NAME,
@@ -188,14 +191,17 @@
       <if test="uploadRecordId != null">
         UPLOAD_RECORD_ID,
       </if>
+      <if test="fileSize != null">
+        FILE_SIZE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       #{id,jdbcType=NUMERIC},
       <if test="bizId != null">
         #{bizId,jdbcType=NUMERIC},
       </if>
-      <if test="bizTypeId != null">
-        #{bizTypeId,jdbcType=NUMERIC},
+      <if test="bizTypeCode != null">
+        #{bizTypeCode,jdbcType=VARCHAR},
       </if>
       <if test="bizTypeName != null">
         #{bizTypeName,jdbcType=VARCHAR},
@@ -209,8 +215,8 @@
       <if test="filePath != null">
         #{filePath,jdbcType=VARCHAR},
       </if>
-      <if test="fileTypeId != null">
-        #{fileTypeId,jdbcType=NUMERIC},
+      <if test="fileTypeCode != null">
+        #{fileTypeCode,jdbcType=VARCHAR},
       </if>
       <if test="fileTypeName != null">
         #{fileTypeName,jdbcType=VARCHAR},
@@ -239,6 +245,9 @@
       <if test="uploadRecordId != null">
         #{uploadRecordId,jdbcType=NUMERIC},
       </if>
+      <if test="fileSize != null">
+        #{fileSize,jdbcType=NUMERIC},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultType="java.lang.Long">
@@ -256,8 +265,8 @@
       <if test="record.bizId != null">
         BIZ_ID = #{record.bizId,jdbcType=NUMERIC},
       </if>
-      <if test="record.bizTypeId != null">
-        BIZ_TYPE_ID = #{record.bizTypeId,jdbcType=NUMERIC},
+      <if test="record.bizTypeCode != null">
+        BIZ_TYPE_CODE = #{record.bizTypeCode,jdbcType=VARCHAR},
       </if>
       <if test="record.bizTypeName != null">
         BIZ_TYPE_NAME = #{record.bizTypeName,jdbcType=VARCHAR},
@@ -271,8 +280,8 @@
       <if test="record.filePath != null">
         FILE_PATH = #{record.filePath,jdbcType=VARCHAR},
       </if>
-      <if test="record.fileTypeId != null">
-        FILE_TYPE_ID = #{record.fileTypeId,jdbcType=NUMERIC},
+      <if test="record.fileTypeCode != null">
+        FILE_TYPE_CODE = #{record.fileTypeCode,jdbcType=VARCHAR},
       </if>
       <if test="record.fileTypeName != null">
         FILE_TYPE_NAME = #{record.fileTypeName,jdbcType=VARCHAR},
@@ -301,6 +310,9 @@
       <if test="record.uploadRecordId != null">
         UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC},
       </if>
+      <if test="record.fileSize != null">
+        FILE_SIZE = #{record.fileSize,jdbcType=NUMERIC},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -310,12 +322,12 @@
     update T_BIZ_ATTACHMENT
     set ID = #{record.id,jdbcType=NUMERIC},
       BIZ_ID = #{record.bizId,jdbcType=NUMERIC},
-      BIZ_TYPE_ID = #{record.bizTypeId,jdbcType=NUMERIC},
+      BIZ_TYPE_CODE = #{record.bizTypeCode,jdbcType=VARCHAR},
       BIZ_TYPE_NAME = #{record.bizTypeName,jdbcType=VARCHAR},
       SOURCE_FILE_NAME = #{record.sourceFileName,jdbcType=VARCHAR},
       FILE_NAME = #{record.fileName,jdbcType=VARCHAR},
       FILE_PATH = #{record.filePath,jdbcType=VARCHAR},
-      FILE_TYPE_ID = #{record.fileTypeId,jdbcType=NUMERIC},
+      FILE_TYPE_CODE = #{record.fileTypeCode,jdbcType=VARCHAR},
       FILE_TYPE_NAME = #{record.fileTypeName,jdbcType=VARCHAR},
       STATUS = #{record.status,jdbcType=NUMERIC},
       CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
@@ -324,7 +336,8 @@
       MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
       MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
       MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
-      UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC}
+      UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC},
+      FILE_SIZE = #{record.fileSize,jdbcType=NUMERIC}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -335,8 +348,8 @@
       <if test="bizId != null">
         BIZ_ID = #{bizId,jdbcType=NUMERIC},
       </if>
-      <if test="bizTypeId != null">
-        BIZ_TYPE_ID = #{bizTypeId,jdbcType=NUMERIC},
+      <if test="bizTypeCode != null">
+        BIZ_TYPE_CODE = #{bizTypeCode,jdbcType=VARCHAR},
       </if>
       <if test="bizTypeName != null">
         BIZ_TYPE_NAME = #{bizTypeName,jdbcType=VARCHAR},
@@ -350,8 +363,8 @@
       <if test="filePath != null">
         FILE_PATH = #{filePath,jdbcType=VARCHAR},
       </if>
-      <if test="fileTypeId != null">
-        FILE_TYPE_ID = #{fileTypeId,jdbcType=NUMERIC},
+      <if test="fileTypeCode != null">
+        FILE_TYPE_CODE = #{fileTypeCode,jdbcType=VARCHAR},
       </if>
       <if test="fileTypeName != null">
         FILE_TYPE_NAME = #{fileTypeName,jdbcType=VARCHAR},
@@ -380,18 +393,21 @@
       <if test="uploadRecordId != null">
         UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC},
       </if>
+      <if test="fileSize != null">
+        FILE_SIZE = #{fileSize,jdbcType=NUMERIC},
+      </if>
     </set>
     where ID = #{id,jdbcType=NUMERIC}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.biz.Attachment">
     update T_BIZ_ATTACHMENT
     set BIZ_ID = #{bizId,jdbcType=NUMERIC},
-      BIZ_TYPE_ID = #{bizTypeId,jdbcType=NUMERIC},
+      BIZ_TYPE_CODE = #{bizTypeCode,jdbcType=VARCHAR},
       BIZ_TYPE_NAME = #{bizTypeName,jdbcType=VARCHAR},
       SOURCE_FILE_NAME = #{sourceFileName,jdbcType=VARCHAR},
       FILE_NAME = #{fileName,jdbcType=VARCHAR},
       FILE_PATH = #{filePath,jdbcType=VARCHAR},
-      FILE_TYPE_ID = #{fileTypeId,jdbcType=NUMERIC},
+      FILE_TYPE_CODE = #{fileTypeCode,jdbcType=VARCHAR},
       FILE_TYPE_NAME = #{fileTypeName,jdbcType=VARCHAR},
       STATUS = #{status,jdbcType=NUMERIC},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
@@ -400,7 +416,8 @@
       MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
       MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
       MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
-      UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC}
+      UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC},
+      FILE_SIZE = #{fileSize,jdbcType=NUMERIC}
     where ID = #{id,jdbcType=NUMERIC}
   </update>
   <sql id="OracleDialectPrefix">

@@ -6,8 +6,6 @@
     <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
     <result column="SEND_TIME" jdbcType="TIMESTAMP" property="sendTime" />
     <result column="SHIP_DATE" jdbcType="TIMESTAMP" property="shipDate" />
-    <result column="SHIPPER_COUNTRY" jdbcType="VARCHAR" property="shipperCountry" />
-    <result column="RECIPIENT_COUNTRY" jdbcType="VARCHAR" property="recipientCountry" />
     <result column="DEST_IATA_CODE" jdbcType="VARCHAR" property="destIataCode" />
     <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
     <result column="CREATE_USER_ID" jdbcType="NUMERIC" property="createUserId" />
@@ -15,8 +13,6 @@
     <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
     <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
-    <result column="ORIGIN_COUNTRY" jdbcType="VARCHAR" property="originCountry" />
-    <result column="DESTINATION_COUNTRY" jdbcType="VARCHAR" property="destinationCountry" />
     <result column="CUSTOMS_CURRENCY" jdbcType="VARCHAR" property="customsCurrency" />
     <result column="CUSTOMS_VALUE" jdbcType="NUMERIC" property="customsValue" />
     <result column="WEIGHT" jdbcType="NUMERIC" property="weight" />
@@ -39,6 +35,10 @@
     <result column="RECIPIENT_CITY" jdbcType="VARCHAR" property="recipientCity" />
     <result column="RECIPIENT_POSTAL_CODE" jdbcType="VARCHAR" property="recipientPostalCode" />
     <result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" />
+    <result column="USER_UUID" jdbcType="VARCHAR" property="userUuid" />
+    <result column="SHIPPER_EMAIL" jdbcType="VARCHAR" property="shipperEmail" />
+    <result column="SHIPPER_COUNTRY" jdbcType="VARCHAR" property="shipperCountry" />
+    <result column="RECIPIENT_COUNTRY" jdbcType="VARCHAR" property="recipientCountry" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -99,13 +99,14 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    ID, CONSIGNMENT_CODE, SEND_TIME, SHIP_DATE, SHIPPER_COUNTRY, RECIPIENT_COUNTRY, DEST_IATA_CODE, 
-    CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 
-    ORIGIN_COUNTRY, DESTINATION_COUNTRY, CUSTOMS_CURRENCY, CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT, 
-    SCANDATE, SHIPPER_CONTACT_NAME, SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY, 
-    SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY, SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, 
-    RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, 
-    RECIPIENT_CITY, RECIPIENT_POSTAL_CODE, DOC_NONDOC_FLAG
+    ID, CONSIGNMENT_CODE, SEND_TIME, SHIP_DATE, DEST_IATA_CODE, CREATE_TIME, CREATE_USER_ID, 
+    CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, CUSTOMS_CURRENCY, 
+    CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT, SCANDATE, SHIPPER_CONTACT_NAME, SHIPPER_PHONE, 
+    SHIPPER_ACCOUNT, SHIPPER_COMPANY, SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY, 
+    SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE, RECIPIENT_COMPANY, 
+    RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, RECIPIENT_CITY, 
+    RECIPIENT_POSTAL_CODE, DOC_NONDOC_FLAG, USER_UUID, SHIPPER_EMAIL, SHIPPER_COUNTRY, 
+    RECIPIENT_COUNTRY
   </sql>
   <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample" resultMap="BaseResultMap">
     <include refid="OracleDialectPrefix" />
@@ -145,33 +146,31 @@
       SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL
     </selectKey>
     insert into ICLEARIMP.T_BIZ_CE_INFO (ID, CONSIGNMENT_CODE, SEND_TIME, 
-      SHIP_DATE, SHIPPER_COUNTRY, RECIPIENT_COUNTRY, 
-      DEST_IATA_CODE, CREATE_TIME, CREATE_USER_ID, 
-      CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 
-      MODIFY_USER_NAME, ORIGIN_COUNTRY, DESTINATION_COUNTRY, 
-      CUSTOMS_CURRENCY, CUSTOMS_VALUE, WEIGHT, 
-      WEIGHTUNIT, SCANDATE, SHIPPER_CONTACT_NAME, 
-      SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY, 
-      SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY, 
-      SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, 
-      RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1, 
-      RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, 
-      RECIPIENT_CITY, RECIPIENT_POSTAL_CODE, DOC_NONDOC_FLAG
-      )
+      SHIP_DATE, DEST_IATA_CODE, CREATE_TIME, 
+      CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 
+      MODIFY_USER_ID, MODIFY_USER_NAME, CUSTOMS_CURRENCY, 
+      CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT, 
+      SCANDATE, SHIPPER_CONTACT_NAME, SHIPPER_PHONE, 
+      SHIPPER_ACCOUNT, SHIPPER_COMPANY, SHIPPER_ADDR_LINE1, 
+      SHIPPER_ADDR_LINE2, SHIPPER_CITY, SHIPPER_POSTAL_CODE, 
+      RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE, RECIPIENT_COMPANY, 
+      RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, 
+      RECIPIENT_ADDR_LINE3, RECIPIENT_CITY, RECIPIENT_POSTAL_CODE, 
+      DOC_NONDOC_FLAG, USER_UUID, SHIPPER_EMAIL, 
+      SHIPPER_COUNTRY, RECIPIENT_COUNTRY)
     values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{sendTime,jdbcType=TIMESTAMP}, 
-      #{shipDate,jdbcType=TIMESTAMP}, #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, 
-      #{destIataCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 
-      #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 
-      #{modifyUserName,jdbcType=VARCHAR}, #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, 
-      #{customsCurrency,jdbcType=VARCHAR}, #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC}, 
-      #{weightunit,jdbcType=VARCHAR}, #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR}, 
-      #{shipperPhone,jdbcType=VARCHAR}, #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR}, 
-      #{shipperAddrLine1,jdbcType=VARCHAR}, #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR}, 
-      #{shipperPostalCode,jdbcType=VARCHAR}, #{recipientContactName,jdbcType=VARCHAR}, 
-      #{recipientPhone,jdbcType=VARCHAR}, #{recipientCompany,jdbcType=VARCHAR}, #{recipientAddrLine1,jdbcType=VARCHAR}, 
-      #{recipientAddrLine2,jdbcType=VARCHAR}, #{recipientAddrLine3,jdbcType=VARCHAR}, 
-      #{recipientCity,jdbcType=VARCHAR}, #{recipientPostalCode,jdbcType=VARCHAR}, #{docNondocFlag,jdbcType=VARCHAR}
-      )
+      #{shipDate,jdbcType=TIMESTAMP}, #{destIataCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
+      #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR}, 
+      #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC}, #{weightunit,jdbcType=VARCHAR}, 
+      #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR}, 
+      #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR}, #{shipperAddrLine1,jdbcType=VARCHAR}, 
+      #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR}, #{shipperPostalCode,jdbcType=VARCHAR}, 
+      #{recipientContactName,jdbcType=VARCHAR}, #{recipientPhone,jdbcType=VARCHAR}, #{recipientCompany,jdbcType=VARCHAR}, 
+      #{recipientAddrLine1,jdbcType=VARCHAR}, #{recipientAddrLine2,jdbcType=VARCHAR}, 
+      #{recipientAddrLine3,jdbcType=VARCHAR}, #{recipientCity,jdbcType=VARCHAR}, #{recipientPostalCode,jdbcType=VARCHAR}, 
+      #{docNondocFlag,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{shipperEmail,jdbcType=VARCHAR}, 
+      #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.CeInfo">
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
@@ -189,12 +188,6 @@
       <if test="shipDate != null">
         SHIP_DATE,
       </if>
-      <if test="shipperCountry != null">
-        SHIPPER_COUNTRY,
-      </if>
-      <if test="recipientCountry != null">
-        RECIPIENT_COUNTRY,
-      </if>
       <if test="destIataCode != null">
         DEST_IATA_CODE,
       </if>
@@ -216,12 +209,6 @@
       <if test="modifyUserName != null">
         MODIFY_USER_NAME,
       </if>
-      <if test="originCountry != null">
-        ORIGIN_COUNTRY,
-      </if>
-      <if test="destinationCountry != null">
-        DESTINATION_COUNTRY,
-      </if>
       <if test="customsCurrency != null">
         CUSTOMS_CURRENCY,
       </if>
@@ -288,6 +275,18 @@
       <if test="docNondocFlag != null">
         DOC_NONDOC_FLAG,
       </if>
+      <if test="userUuid != null">
+        USER_UUID,
+      </if>
+      <if test="shipperEmail != null">
+        SHIPPER_EMAIL,
+      </if>
+      <if test="shipperCountry != null">
+        SHIPPER_COUNTRY,
+      </if>
+      <if test="recipientCountry != null">
+        RECIPIENT_COUNTRY,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       #{id,jdbcType=NUMERIC},
@@ -300,12 +299,6 @@
       <if test="shipDate != null">
         #{shipDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="shipperCountry != null">
-        #{shipperCountry,jdbcType=VARCHAR},
-      </if>
-      <if test="recipientCountry != null">
-        #{recipientCountry,jdbcType=VARCHAR},
-      </if>
       <if test="destIataCode != null">
         #{destIataCode,jdbcType=VARCHAR},
       </if>
@@ -327,12 +320,6 @@
       <if test="modifyUserName != null">
         #{modifyUserName,jdbcType=VARCHAR},
       </if>
-      <if test="originCountry != null">
-        #{originCountry,jdbcType=VARCHAR},
-      </if>
-      <if test="destinationCountry != null">
-        #{destinationCountry,jdbcType=VARCHAR},
-      </if>
       <if test="customsCurrency != null">
         #{customsCurrency,jdbcType=VARCHAR},
       </if>
@@ -399,6 +386,18 @@
       <if test="docNondocFlag != null">
         #{docNondocFlag,jdbcType=VARCHAR},
       </if>
+      <if test="userUuid != null">
+        #{userUuid,jdbcType=VARCHAR},
+      </if>
+      <if test="shipperEmail != null">
+        #{shipperEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="shipperCountry != null">
+        #{shipperCountry,jdbcType=VARCHAR},
+      </if>
+      <if test="recipientCountry != null">
+        #{recipientCountry,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample" resultType="java.lang.Long">
@@ -422,12 +421,6 @@
       <if test="record.shipDate != null">
         SHIP_DATE = #{record.shipDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.shipperCountry != null">
-        SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
-      </if>
-      <if test="record.recipientCountry != null">
-        RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR},
-      </if>
       <if test="record.destIataCode != null">
         DEST_IATA_CODE = #{record.destIataCode,jdbcType=VARCHAR},
       </if>
@@ -449,12 +442,6 @@
       <if test="record.modifyUserName != null">
         MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
       </if>
-      <if test="record.originCountry != null">
-        ORIGIN_COUNTRY = #{record.originCountry,jdbcType=VARCHAR},
-      </if>
-      <if test="record.destinationCountry != null">
-        DESTINATION_COUNTRY = #{record.destinationCountry,jdbcType=VARCHAR},
-      </if>
       <if test="record.customsCurrency != null">
         CUSTOMS_CURRENCY = #{record.customsCurrency,jdbcType=VARCHAR},
       </if>
@@ -521,6 +508,18 @@
       <if test="record.docNondocFlag != null">
         DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR},
       </if>
+      <if test="record.userUuid != null">
+        USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shipperEmail != null">
+        SHIPPER_EMAIL = #{record.shipperEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shipperCountry != null">
+        SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
+      </if>
+      <if test="record.recipientCountry != null">
+        RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -532,8 +531,6 @@
       CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
       SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP},
       SHIP_DATE = #{record.shipDate,jdbcType=TIMESTAMP},
-      SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
-      RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR},
       DEST_IATA_CODE = #{record.destIataCode,jdbcType=VARCHAR},
       CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
       CREATE_USER_ID = #{record.createUserId,jdbcType=NUMERIC},
@@ -541,8 +538,6 @@
       MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
       MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
       MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
-      ORIGIN_COUNTRY = #{record.originCountry,jdbcType=VARCHAR},
-      DESTINATION_COUNTRY = #{record.destinationCountry,jdbcType=VARCHAR},
       CUSTOMS_CURRENCY = #{record.customsCurrency,jdbcType=VARCHAR},
       CUSTOMS_VALUE = #{record.customsValue,jdbcType=NUMERIC},
       WEIGHT = #{record.weight,jdbcType=NUMERIC},
@@ -564,7 +559,11 @@
       RECIPIENT_ADDR_LINE3 = #{record.recipientAddrLine3,jdbcType=VARCHAR},
       RECIPIENT_CITY = #{record.recipientCity,jdbcType=VARCHAR},
       RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR},
-      DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR}
+      DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR},
+      USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
+      SHIPPER_EMAIL = #{record.shipperEmail,jdbcType=VARCHAR},
+      SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
+      RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -581,12 +580,6 @@
       <if test="shipDate != null">
         SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="shipperCountry != null">
-        SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
-      </if>
-      <if test="recipientCountry != null">
-        RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR},
-      </if>
       <if test="destIataCode != null">
         DEST_IATA_CODE = #{destIataCode,jdbcType=VARCHAR},
       </if>
@@ -608,12 +601,6 @@
       <if test="modifyUserName != null">
         MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
       </if>
-      <if test="originCountry != null">
-        ORIGIN_COUNTRY = #{originCountry,jdbcType=VARCHAR},
-      </if>
-      <if test="destinationCountry != null">
-        DESTINATION_COUNTRY = #{destinationCountry,jdbcType=VARCHAR},
-      </if>
       <if test="customsCurrency != null">
         CUSTOMS_CURRENCY = #{customsCurrency,jdbcType=VARCHAR},
       </if>
@@ -680,6 +667,18 @@
       <if test="docNondocFlag != null">
         DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR},
       </if>
+      <if test="userUuid != null">
+        USER_UUID = #{userUuid,jdbcType=VARCHAR},
+      </if>
+      <if test="shipperEmail != null">
+        SHIPPER_EMAIL = #{shipperEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="shipperCountry != null">
+        SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
+      </if>
+      <if test="recipientCountry != null">
+        RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR},
+      </if>
     </set>
     where ID = #{id,jdbcType=NUMERIC}
   </update>
@@ -688,8 +687,6 @@
     set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
       SEND_TIME = #{sendTime,jdbcType=TIMESTAMP},
       SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP},
-      SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
-      RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR},
       DEST_IATA_CODE = #{destIataCode,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       CREATE_USER_ID = #{createUserId,jdbcType=NUMERIC},
@@ -697,8 +694,6 @@
       MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
       MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
       MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
-      ORIGIN_COUNTRY = #{originCountry,jdbcType=VARCHAR},
-      DESTINATION_COUNTRY = #{destinationCountry,jdbcType=VARCHAR},
       CUSTOMS_CURRENCY = #{customsCurrency,jdbcType=VARCHAR},
       CUSTOMS_VALUE = #{customsValue,jdbcType=NUMERIC},
       WEIGHT = #{weight,jdbcType=NUMERIC},
@@ -720,7 +715,11 @@
       RECIPIENT_ADDR_LINE3 = #{recipientAddrLine3,jdbcType=VARCHAR},
       RECIPIENT_CITY = #{recipientCity,jdbcType=VARCHAR},
       RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR},
-      DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR}
+      DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR},
+      USER_UUID = #{userUuid,jdbcType=VARCHAR},
+      SHIPPER_EMAIL = #{shipperEmail,jdbcType=VARCHAR},
+      SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
+      RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=NUMERIC}
   </update>
   <sql id="OracleDialectPrefix">

@@ -5,8 +5,6 @@
     <id column="ID" jdbcType="NUMERIC" property="id" />
     <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
     <result column="SHIP_DATE" jdbcType="TIMESTAMP" property="shipDate" />
-    <result column="SHIPPER_COUNTRY" jdbcType="VARCHAR" property="shipperCountry" />
-    <result column="RECIPIENT_COUNTRY" jdbcType="VARCHAR" property="recipientCountry" />
     <result column="DEST_IATA_CODE" jdbcType="VARCHAR" property="destIataCode" />
     <result column="ORIGIN_COUNTRY" jdbcType="VARCHAR" property="originCountry" />
     <result column="DESTINATION_COUNTRY" jdbcType="VARCHAR" property="destinationCountry" />
@@ -44,14 +42,16 @@
     <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
     <result column="CE_INFO_ID" jdbcType="NUMERIC" property="ceInfoId" />
     <result column="RECIPIENT_POSTAL_CODE" jdbcType="VARCHAR" property="recipientPostalCode" />
-    <result column="STATUS_ID" jdbcType="NUMERIC" property="statusId" />
+    <result column="STATUS_CODE" jdbcType="VARCHAR" property="statusCode" />
     <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
     <result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" />
     <result column="USER_UUID" jdbcType="VARCHAR" property="userUuid" />
     <result column="USER_INPUT_SHIPPER_ACCOUNT" jdbcType="VARCHAR" property="userInputShipperAccount" />
-    <result column="USER_INPUT_ORIGIN_COUNTRY_ID" jdbcType="NUMERIC" property="userInputOriginCountryId" />
+    <result column="USER_INPUT_ORIGIN_COUNTRY_CODE" jdbcType="VARCHAR" property="userInputOriginCountryCode" />
     <result column="USER_INPUT_ORIGIN_COUNTRY" jdbcType="VARCHAR" property="userInputOriginCountry" />
-    <result column="ORIGIN_COUNTRY_ID" jdbcType="NUMERIC" property="originCountryId" />
+    <result column="ORIGIN_COUNTRY_CODE" jdbcType="VARCHAR" property="originCountryCode" />
+    <result column="SHIPPER_EMAIL" jdbcType="VARCHAR" property="shipperEmail" />
+    <result column="DESTINATION_COUNTRY_CODE" jdbcType="VARCHAR" property="destinationCountryCode" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -112,16 +112,16 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    ID, CONSIGNMENT_CODE, SHIP_DATE, SHIPPER_COUNTRY, RECIPIENT_COUNTRY, DEST_IATA_CODE, 
-    ORIGIN_COUNTRY, DESTINATION_COUNTRY, CUSTOMS_CURRENCY, CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT, 
-    SCANDATE, SHIPPER_CONTACT_NAME, SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY, 
-    SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY, SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, 
-    RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, 
-    RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME, 
-    SUBMITTER_ID, SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 
-    MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME, 
-    DOC_NONDOC_FLAG, USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_ID, 
-    USER_INPUT_ORIGIN_COUNTRY, ORIGIN_COUNTRY_ID
+    ID, CONSIGNMENT_CODE, SHIP_DATE, DEST_IATA_CODE, ORIGIN_COUNTRY, DESTINATION_COUNTRY, 
+    CUSTOMS_CURRENCY, CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT, SCANDATE, SHIPPER_CONTACT_NAME, 
+    SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY, SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, 
+    SHIPPER_CITY, SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE, RECIPIENT_COMPANY, 
+    RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, RECIPIENT_CITY, 
+    FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME, SUBMITTER_ID, 
+    SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 
+    MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_CODE, STATUS_NAME, DOC_NONDOC_FLAG, 
+    USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_CODE, USER_INPUT_ORIGIN_COUNTRY, 
+    ORIGIN_COUNTRY_CODE, SHIPPER_EMAIL, DESTINATION_COUNTRY_CODE
   </sql>
   <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultMap="BaseResultMap">
     <include refid="OracleDialectPrefix" />
@@ -161,41 +161,41 @@
       SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL
     </selectKey>
     insert into T_BIZ_CONSIGNMENT (ID, CONSIGNMENT_CODE, SHIP_DATE, 
-      SHIPPER_COUNTRY, RECIPIENT_COUNTRY, DEST_IATA_CODE, 
-      ORIGIN_COUNTRY, DESTINATION_COUNTRY, CUSTOMS_CURRENCY, 
-      CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT, 
-      SCANDATE, SHIPPER_CONTACT_NAME, SHIPPER_PHONE, 
-      SHIPPER_ACCOUNT, SHIPPER_COMPANY, SHIPPER_ADDR_LINE1, 
-      SHIPPER_ADDR_LINE2, SHIPPER_CITY, SHIPPER_POSTAL_CODE, 
-      RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE, RECIPIENT_COMPANY, 
-      RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, 
-      RECIPIENT_ADDR_LINE3, RECIPIENT_CITY, FIRST_COMMIT_TIME, 
-      FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME, 
-      SUBMITTER_ID, SUBMITTER, CREATE_TIME, 
-      CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 
-      MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, 
-      RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME, 
-      DOC_NONDOC_FLAG, USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, 
-      USER_INPUT_ORIGIN_COUNTRY_ID, USER_INPUT_ORIGIN_COUNTRY, 
-      ORIGIN_COUNTRY_ID)
+      DEST_IATA_CODE, ORIGIN_COUNTRY, DESTINATION_COUNTRY, 
+      CUSTOMS_CURRENCY, CUSTOMS_VALUE, WEIGHT, 
+      WEIGHTUNIT, SCANDATE, SHIPPER_CONTACT_NAME, 
+      SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY, 
+      SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY, 
+      SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, 
+      RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1, 
+      RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, 
+      RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, 
+      FIRST_SUBMITTER, COMMIT_TIME, SUBMITTER_ID, 
+      SUBMITTER, CREATE_TIME, CREATE_USER_ID, 
+      CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 
+      MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, 
+      STATUS_CODE, STATUS_NAME, DOC_NONDOC_FLAG, 
+      USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_CODE, 
+      USER_INPUT_ORIGIN_COUNTRY, ORIGIN_COUNTRY_CODE, 
+      SHIPPER_EMAIL, DESTINATION_COUNTRY_CODE)
     values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP}, 
-      #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, #{destIataCode,jdbcType=VARCHAR}, 
-      #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR}, 
-      #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC}, #{weightunit,jdbcType=VARCHAR}, 
-      #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR}, 
-      #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR}, #{shipperAddrLine1,jdbcType=VARCHAR}, 
-      #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR}, #{shipperPostalCode,jdbcType=VARCHAR}, 
-      #{recipientContactName,jdbcType=VARCHAR}, #{recipientPhone,jdbcType=VARCHAR}, #{recipientCompany,jdbcType=VARCHAR}, 
-      #{recipientAddrLine1,jdbcType=VARCHAR}, #{recipientAddrLine2,jdbcType=VARCHAR}, 
-      #{recipientAddrLine3,jdbcType=VARCHAR}, #{recipientCity,jdbcType=VARCHAR}, #{firstCommitTime,jdbcType=TIMESTAMP}, 
-      #{firstSubmitterId,jdbcType=NUMERIC}, #{firstSubmitter,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP}, 
-      #{submitterId,jdbcType=NUMERIC}, #{submitter,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
-      #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC}, 
-      #{recipientPostalCode,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR}, 
-      #{docNondocFlag,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{userInputShipperAccount,jdbcType=VARCHAR}, 
-      #{userInputOriginCountryId,jdbcType=NUMERIC}, #{userInputOriginCountry,jdbcType=VARCHAR}, 
-      #{originCountryId,jdbcType=NUMERIC})
+      #{destIataCode,jdbcType=VARCHAR}, #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, 
+      #{customsCurrency,jdbcType=VARCHAR}, #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC}, 
+      #{weightunit,jdbcType=VARCHAR}, #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR}, 
+      #{shipperPhone,jdbcType=VARCHAR}, #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR}, 
+      #{shipperAddrLine1,jdbcType=VARCHAR}, #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR}, 
+      #{shipperPostalCode,jdbcType=VARCHAR}, #{recipientContactName,jdbcType=VARCHAR}, 
+      #{recipientPhone,jdbcType=VARCHAR}, #{recipientCompany,jdbcType=VARCHAR}, #{recipientAddrLine1,jdbcType=VARCHAR}, 
+      #{recipientAddrLine2,jdbcType=VARCHAR}, #{recipientAddrLine3,jdbcType=VARCHAR}, 
+      #{recipientCity,jdbcType=VARCHAR}, #{firstCommitTime,jdbcType=TIMESTAMP}, #{firstSubmitterId,jdbcType=NUMERIC}, 
+      #{firstSubmitter,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP}, #{submitterId,jdbcType=NUMERIC}, 
+      #{submitter,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 
+      #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 
+      #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC}, #{recipientPostalCode,jdbcType=VARCHAR}, 
+      #{statusCode,jdbcType=VARCHAR}, #{statusName,jdbcType=VARCHAR}, #{docNondocFlag,jdbcType=VARCHAR}, 
+      #{userUuid,jdbcType=VARCHAR}, #{userInputShipperAccount,jdbcType=VARCHAR}, #{userInputOriginCountryCode,jdbcType=VARCHAR}, 
+      #{userInputOriginCountry,jdbcType=VARCHAR}, #{originCountryCode,jdbcType=VARCHAR}, 
+      #{shipperEmail,jdbcType=VARCHAR}, #{destinationCountryCode,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Consignment">
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
@@ -210,12 +210,6 @@
       <if test="shipDate != null">
         SHIP_DATE,
       </if>
-      <if test="shipperCountry != null">
-        SHIPPER_COUNTRY,
-      </if>
-      <if test="recipientCountry != null">
-        RECIPIENT_COUNTRY,
-      </if>
       <if test="destIataCode != null">
         DEST_IATA_CODE,
       </if>
@@ -327,8 +321,8 @@
       <if test="recipientPostalCode != null">
         RECIPIENT_POSTAL_CODE,
       </if>
-      <if test="statusId != null">
-        STATUS_ID,
+      <if test="statusCode != null">
+        STATUS_CODE,
       </if>
       <if test="statusName != null">
         STATUS_NAME,
@@ -342,14 +336,20 @@
       <if test="userInputShipperAccount != null">
         USER_INPUT_SHIPPER_ACCOUNT,
       </if>
-      <if test="userInputOriginCountryId != null">
-        USER_INPUT_ORIGIN_COUNTRY_ID,
+      <if test="userInputOriginCountryCode != null">
+        USER_INPUT_ORIGIN_COUNTRY_CODE,
       </if>
       <if test="userInputOriginCountry != null">
         USER_INPUT_ORIGIN_COUNTRY,
       </if>
-      <if test="originCountryId != null">
-        ORIGIN_COUNTRY_ID,
+      <if test="originCountryCode != null">
+        ORIGIN_COUNTRY_CODE,
+      </if>
+      <if test="shipperEmail != null">
+        SHIPPER_EMAIL,
+      </if>
+      <if test="destinationCountryCode != null">
+        DESTINATION_COUNTRY_CODE,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -360,12 +360,6 @@
       <if test="shipDate != null">
         #{shipDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="shipperCountry != null">
-        #{shipperCountry,jdbcType=VARCHAR},
-      </if>
-      <if test="recipientCountry != null">
-        #{recipientCountry,jdbcType=VARCHAR},
-      </if>
       <if test="destIataCode != null">
         #{destIataCode,jdbcType=VARCHAR},
       </if>
@@ -477,8 +471,8 @@
       <if test="recipientPostalCode != null">
         #{recipientPostalCode,jdbcType=VARCHAR},
       </if>
-      <if test="statusId != null">
-        #{statusId,jdbcType=NUMERIC},
+      <if test="statusCode != null">
+        #{statusCode,jdbcType=VARCHAR},
       </if>
       <if test="statusName != null">
         #{statusName,jdbcType=VARCHAR},
@@ -492,14 +486,20 @@
       <if test="userInputShipperAccount != null">
         #{userInputShipperAccount,jdbcType=VARCHAR},
       </if>
-      <if test="userInputOriginCountryId != null">
-        #{userInputOriginCountryId,jdbcType=NUMERIC},
+      <if test="userInputOriginCountryCode != null">
+        #{userInputOriginCountryCode,jdbcType=VARCHAR},
       </if>
       <if test="userInputOriginCountry != null">
         #{userInputOriginCountry,jdbcType=VARCHAR},
       </if>
-      <if test="originCountryId != null">
-        #{originCountryId,jdbcType=NUMERIC},
+      <if test="originCountryCode != null">
+        #{originCountryCode,jdbcType=VARCHAR},
+      </if>
+      <if test="shipperEmail != null">
+        #{shipperEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="destinationCountryCode != null">
+        #{destinationCountryCode,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -521,12 +521,6 @@
       <if test="record.shipDate != null">
         SHIP_DATE = #{record.shipDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.shipperCountry != null">
-        SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
-      </if>
-      <if test="record.recipientCountry != null">
-        RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR},
-      </if>
       <if test="record.destIataCode != null">
         DEST_IATA_CODE = #{record.destIataCode,jdbcType=VARCHAR},
       </if>
@@ -638,8 +632,8 @@
       <if test="record.recipientPostalCode != null">
         RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR},
       </if>
-      <if test="record.statusId != null">
-        STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
+      <if test="record.statusCode != null">
+        STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       </if>
       <if test="record.statusName != null">
         STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
@@ -653,14 +647,20 @@
       <if test="record.userInputShipperAccount != null">
         USER_INPUT_SHIPPER_ACCOUNT = #{record.userInputShipperAccount,jdbcType=VARCHAR},
       </if>
-      <if test="record.userInputOriginCountryId != null">
-        USER_INPUT_ORIGIN_COUNTRY_ID = #{record.userInputOriginCountryId,jdbcType=NUMERIC},
+      <if test="record.userInputOriginCountryCode != null">
+        USER_INPUT_ORIGIN_COUNTRY_CODE = #{record.userInputOriginCountryCode,jdbcType=VARCHAR},
       </if>
       <if test="record.userInputOriginCountry != null">
         USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR},
       </if>
-      <if test="record.originCountryId != null">
-        ORIGIN_COUNTRY_ID = #{record.originCountryId,jdbcType=NUMERIC},
+      <if test="record.originCountryCode != null">
+        ORIGIN_COUNTRY_CODE = #{record.originCountryCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shipperEmail != null">
+        SHIPPER_EMAIL = #{record.shipperEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="record.destinationCountryCode != null">
+        DESTINATION_COUNTRY_CODE = #{record.destinationCountryCode,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -672,8 +672,6 @@
     set ID = #{record.id,jdbcType=NUMERIC},
       CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
       SHIP_DATE = #{record.shipDate,jdbcType=TIMESTAMP},
-      SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
-      RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR},
       DEST_IATA_CODE = #{record.destIataCode,jdbcType=VARCHAR},
       ORIGIN_COUNTRY = #{record.originCountry,jdbcType=VARCHAR},
       DESTINATION_COUNTRY = #{record.destinationCountry,jdbcType=VARCHAR},
@@ -711,14 +709,16 @@
       MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
       CE_INFO_ID = #{record.ceInfoId,jdbcType=NUMERIC},
       RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR},
-      STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
       DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR},
       USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
       USER_INPUT_SHIPPER_ACCOUNT = #{record.userInputShipperAccount,jdbcType=VARCHAR},
-      USER_INPUT_ORIGIN_COUNTRY_ID = #{record.userInputOriginCountryId,jdbcType=NUMERIC},
+      USER_INPUT_ORIGIN_COUNTRY_CODE = #{record.userInputOriginCountryCode,jdbcType=VARCHAR},
       USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR},
-      ORIGIN_COUNTRY_ID = #{record.originCountryId,jdbcType=NUMERIC}
+      ORIGIN_COUNTRY_CODE = #{record.originCountryCode,jdbcType=VARCHAR},
+      SHIPPER_EMAIL = #{record.shipperEmail,jdbcType=VARCHAR},
+      DESTINATION_COUNTRY_CODE = #{record.destinationCountryCode,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -732,12 +732,6 @@
       <if test="shipDate != null">
         SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="shipperCountry != null">
-        SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
-      </if>
-      <if test="recipientCountry != null">
-        RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR},
-      </if>
       <if test="destIataCode != null">
         DEST_IATA_CODE = #{destIataCode,jdbcType=VARCHAR},
       </if>
@@ -849,8 +843,8 @@
       <if test="recipientPostalCode != null">
         RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR},
       </if>
-      <if test="statusId != null">
-        STATUS_ID = #{statusId,jdbcType=NUMERIC},
+      <if test="statusCode != null">
+        STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       </if>
       <if test="statusName != null">
         STATUS_NAME = #{statusName,jdbcType=VARCHAR},
@@ -864,14 +858,20 @@
       <if test="userInputShipperAccount != null">
         USER_INPUT_SHIPPER_ACCOUNT = #{userInputShipperAccount,jdbcType=VARCHAR},
       </if>
-      <if test="userInputOriginCountryId != null">
-        USER_INPUT_ORIGIN_COUNTRY_ID = #{userInputOriginCountryId,jdbcType=NUMERIC},
+      <if test="userInputOriginCountryCode != null">
+        USER_INPUT_ORIGIN_COUNTRY_CODE = #{userInputOriginCountryCode,jdbcType=VARCHAR},
       </if>
       <if test="userInputOriginCountry != null">
         USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR},
       </if>
-      <if test="originCountryId != null">
-        ORIGIN_COUNTRY_ID = #{originCountryId,jdbcType=NUMERIC},
+      <if test="originCountryCode != null">
+        ORIGIN_COUNTRY_CODE = #{originCountryCode,jdbcType=VARCHAR},
+      </if>
+      <if test="shipperEmail != null">
+        SHIPPER_EMAIL = #{shipperEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="destinationCountryCode != null">
+        DESTINATION_COUNTRY_CODE = #{destinationCountryCode,jdbcType=VARCHAR},
       </if>
     </set>
     where ID = #{id,jdbcType=NUMERIC}
@@ -880,8 +880,6 @@
     update T_BIZ_CONSIGNMENT
     set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
       SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP},
-      SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
-      RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR},
       DEST_IATA_CODE = #{destIataCode,jdbcType=VARCHAR},
       ORIGIN_COUNTRY = #{originCountry,jdbcType=VARCHAR},
       DESTINATION_COUNTRY = #{destinationCountry,jdbcType=VARCHAR},
@@ -919,14 +917,16 @@
       MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
       CE_INFO_ID = #{ceInfoId,jdbcType=NUMERIC},
       RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR},
-      STATUS_ID = #{statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{statusName,jdbcType=VARCHAR},
       DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR},
       USER_UUID = #{userUuid,jdbcType=VARCHAR},
       USER_INPUT_SHIPPER_ACCOUNT = #{userInputShipperAccount,jdbcType=VARCHAR},
-      USER_INPUT_ORIGIN_COUNTRY_ID = #{userInputOriginCountryId,jdbcType=NUMERIC},
+      USER_INPUT_ORIGIN_COUNTRY_CODE = #{userInputOriginCountryCode,jdbcType=VARCHAR},
       USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR},
-      ORIGIN_COUNTRY_ID = #{originCountryId,jdbcType=NUMERIC}
+      ORIGIN_COUNTRY_CODE = #{originCountryCode,jdbcType=VARCHAR},
+      SHIPPER_EMAIL = #{shipperEmail,jdbcType=VARCHAR},
+      DESTINATION_COUNTRY_CODE = #{destinationCountryCode,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=NUMERIC}
   </update>
   <sql id="OracleDialectPrefix">

@@ -8,9 +8,9 @@
     <result column="TO_ADDRESS" jdbcType="VARCHAR" property="toAddress" />
     <result column="CC_ADDRESS" jdbcType="VARCHAR" property="ccAddress" />
     <result column="SUBJECT" jdbcType="VARCHAR" property="subject" />
-    <result column="TYPE_ID" jdbcType="NUMERIC" property="typeId" />
+    <result column="TYPE_CODE" jdbcType="VARCHAR" property="typeCode" />
     <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" />
-    <result column="STATUS_ID" jdbcType="NUMERIC" property="statusId" />
+    <result column="STATUS_CODE" jdbcType="VARCHAR" property="statusCode" />
     <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
     <result column="SEND_NUM" jdbcType="NUMERIC" property="sendNum" />
     <result column="SEND_TIME" jdbcType="TIMESTAMP" property="sendTime" />
@@ -83,7 +83,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    ID, BIZ_ID, BIZ_CODE, TO_ADDRESS, CC_ADDRESS, SUBJECT, TYPE_ID, TYPE_NAME, STATUS_ID, 
+    ID, BIZ_ID, BIZ_CODE, TO_ADDRESS, CC_ADDRESS, SUBJECT, TYPE_CODE, TYPE_NAME, STATUS_CODE, 
     STATUS_NAME, SEND_NUM, SEND_TIME, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
     MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
   </sql>
@@ -148,14 +148,14 @@
     </selectKey>
     insert into T_BIZ_EMAIL (ID, BIZ_ID, BIZ_CODE, 
       TO_ADDRESS, CC_ADDRESS, SUBJECT, 
-      TYPE_ID, TYPE_NAME, STATUS_ID, 
+      TYPE_CODE, TYPE_NAME, STATUS_CODE, 
       STATUS_NAME, SEND_NUM, SEND_TIME, 
       CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
       MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 
       BODY)
     values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizCode,jdbcType=VARCHAR}, 
       #{toAddress,jdbcType=VARCHAR}, #{ccAddress,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR}, 
-      #{typeId,jdbcType=NUMERIC}, #{typeName,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, 
+      #{typeCode,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR}, #{statusCode,jdbcType=VARCHAR}, 
       #{statusName,jdbcType=VARCHAR}, #{sendNum,jdbcType=NUMERIC}, #{sendTime,jdbcType=TIMESTAMP}, 
       #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, 
       #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, 
@@ -183,14 +183,14 @@
       <if test="subject != null">
         SUBJECT,
       </if>
-      <if test="typeId != null">
-        TYPE_ID,
+      <if test="typeCode != null">
+        TYPE_CODE,
       </if>
       <if test="typeName != null">
         TYPE_NAME,
       </if>
-      <if test="statusId != null">
-        STATUS_ID,
+      <if test="statusCode != null">
+        STATUS_CODE,
       </if>
       <if test="statusName != null">
         STATUS_NAME,
@@ -240,14 +240,14 @@
       <if test="subject != null">
         #{subject,jdbcType=VARCHAR},
       </if>
-      <if test="typeId != null">
-        #{typeId,jdbcType=NUMERIC},
+      <if test="typeCode != null">
+        #{typeCode,jdbcType=VARCHAR},
       </if>
       <if test="typeName != null">
         #{typeName,jdbcType=VARCHAR},
       </if>
-      <if test="statusId != null">
-        #{statusId,jdbcType=NUMERIC},
+      <if test="statusCode != null">
+        #{statusCode,jdbcType=VARCHAR},
       </if>
       <if test="statusName != null">
         #{statusName,jdbcType=VARCHAR},
@@ -308,14 +308,14 @@
       <if test="record.subject != null">
         SUBJECT = #{record.subject,jdbcType=VARCHAR},
       </if>
-      <if test="record.typeId != null">
-        TYPE_ID = #{record.typeId,jdbcType=NUMERIC},
+      <if test="record.typeCode != null">
+        TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
       </if>
       <if test="record.typeName != null">
         TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
       </if>
-      <if test="record.statusId != null">
-        STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
+      <if test="record.statusCode != null">
+        STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       </if>
       <if test="record.statusName != null">
         STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
@@ -360,9 +360,9 @@
       TO_ADDRESS = #{record.toAddress,jdbcType=VARCHAR},
       CC_ADDRESS = #{record.ccAddress,jdbcType=VARCHAR},
       SUBJECT = #{record.subject,jdbcType=VARCHAR},
-      TYPE_ID = #{record.typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
-      STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
       SEND_NUM = #{record.sendNum,jdbcType=NUMERIC},
       SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP},
@@ -385,9 +385,9 @@
       TO_ADDRESS = #{record.toAddress,jdbcType=VARCHAR},
       CC_ADDRESS = #{record.ccAddress,jdbcType=VARCHAR},
       SUBJECT = #{record.subject,jdbcType=VARCHAR},
-      TYPE_ID = #{record.typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
-      STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
       SEND_NUM = #{record.sendNum,jdbcType=NUMERIC},
       SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP},
@@ -419,14 +419,14 @@
       <if test="subject != null">
         SUBJECT = #{subject,jdbcType=VARCHAR},
       </if>
-      <if test="typeId != null">
-        TYPE_ID = #{typeId,jdbcType=NUMERIC},
+      <if test="typeCode != null">
+        TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
       </if>
       <if test="typeName != null">
         TYPE_NAME = #{typeName,jdbcType=VARCHAR},
       </if>
-      <if test="statusId != null">
-        STATUS_ID = #{statusId,jdbcType=NUMERIC},
+      <if test="statusCode != null">
+        STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       </if>
       <if test="statusName != null">
         STATUS_NAME = #{statusName,jdbcType=VARCHAR},
@@ -468,9 +468,9 @@
       TO_ADDRESS = #{toAddress,jdbcType=VARCHAR},
       CC_ADDRESS = #{ccAddress,jdbcType=VARCHAR},
       SUBJECT = #{subject,jdbcType=VARCHAR},
-      TYPE_ID = #{typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{typeName,jdbcType=VARCHAR},
-      STATUS_ID = #{statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{statusName,jdbcType=VARCHAR},
       SEND_NUM = #{sendNum,jdbcType=NUMERIC},
       SEND_TIME = #{sendTime,jdbcType=TIMESTAMP},
@@ -490,9 +490,9 @@
       TO_ADDRESS = #{toAddress,jdbcType=VARCHAR},
       CC_ADDRESS = #{ccAddress,jdbcType=VARCHAR},
       SUBJECT = #{subject,jdbcType=VARCHAR},
-      TYPE_ID = #{typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{typeName,jdbcType=VARCHAR},
-      STATUS_ID = #{statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{statusName,jdbcType=VARCHAR},
       SEND_NUM = #{sendNum,jdbcType=NUMERIC},
       SEND_TIME = #{sendTime,jdbcType=TIMESTAMP},

@@ -5,9 +5,9 @@
     <id column="ID" jdbcType="NUMERIC" property="id" />
     <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
     <result column="CONSIGNMENT_ID" jdbcType="NUMERIC" property="consignmentId" />
-    <result column="STATUS_ID" jdbcType="NUMERIC" property="statusId" />
+    <result column="STATUS_CODE" jdbcType="VARCHAR" property="statusCode" />
     <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
-    <result column="FILE_TYPE_ID" jdbcType="NUMERIC" property="fileTypeId" />
+    <result column="FILE_TYPE_CODE" jdbcType="VARCHAR" property="fileTypeCode" />
     <result column="FILE_TYPE" jdbcType="VARCHAR" property="fileType" />
     <result column="FILE_NAME" jdbcType="VARCHAR" property="fileName" />
     <result column="PUSH_OB_ID" jdbcType="NUMERIC" property="pushObId" />
@@ -79,7 +79,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, STATUS_ID, STATUS_NAME, FILE_TYPE_ID, FILE_TYPE, 
+    ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, STATUS_CODE, STATUS_NAME, FILE_TYPE_CODE, FILE_TYPE, 
     FILE_NAME, PUSH_OB_ID, PUSH_TIME, REMARK, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
     MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
   </sql>
@@ -121,13 +121,13 @@
       SELECT SEQ_T_BIZ_PUSH_OB_DETAIL.NEXTVAL FROM DUAL
     </selectKey>
     insert into T_BIZ_PUSH_OB_DETAIL (ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, 
-      STATUS_ID, STATUS_NAME, FILE_TYPE_ID, 
+      STATUS_CODE, STATUS_NAME, FILE_TYPE_CODE, 
       FILE_TYPE, FILE_NAME, PUSH_OB_ID, 
       PUSH_TIME, REMARK, CREATE_TIME, 
       CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 
       MODIFY_USER_ID, MODIFY_USER_NAME)
     values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{consignmentId,jdbcType=NUMERIC}, 
-      #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=NUMERIC}, 
+      #{statusCode,jdbcType=VARCHAR}, #{statusName,jdbcType=VARCHAR}, #{fileTypeCode,jdbcType=VARCHAR}, 
       #{fileType,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{pushObId,jdbcType=NUMERIC}, 
       #{pushTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
@@ -146,14 +146,14 @@
       <if test="consignmentId != null">
         CONSIGNMENT_ID,
       </if>
-      <if test="statusId != null">
-        STATUS_ID,
+      <if test="statusCode != null">
+        STATUS_CODE,
       </if>
       <if test="statusName != null">
         STATUS_NAME,
       </if>
-      <if test="fileTypeId != null">
-        FILE_TYPE_ID,
+      <if test="fileTypeCode != null">
+        FILE_TYPE_CODE,
       </if>
       <if test="fileType != null">
         FILE_TYPE,
@@ -197,14 +197,14 @@
       <if test="consignmentId != null">
         #{consignmentId,jdbcType=NUMERIC},
       </if>
-      <if test="statusId != null">
-        #{statusId,jdbcType=NUMERIC},
+      <if test="statusCode != null">
+        #{statusCode,jdbcType=VARCHAR},
       </if>
       <if test="statusName != null">
         #{statusName,jdbcType=VARCHAR},
       </if>
-      <if test="fileTypeId != null">
-        #{fileTypeId,jdbcType=NUMERIC},
+      <if test="fileTypeCode != null">
+        #{fileTypeCode,jdbcType=VARCHAR},
       </if>
       <if test="fileType != null">
         #{fileType,jdbcType=VARCHAR},
@@ -259,14 +259,14 @@
       <if test="record.consignmentId != null">
         CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
       </if>
-      <if test="record.statusId != null">
-        STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
+      <if test="record.statusCode != null">
+        STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       </if>
       <if test="record.statusName != null">
         STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
       </if>
-      <if test="record.fileTypeId != null">
-        FILE_TYPE_ID = #{record.fileTypeId,jdbcType=NUMERIC},
+      <if test="record.fileTypeCode != null">
+        FILE_TYPE_CODE = #{record.fileTypeCode,jdbcType=VARCHAR},
       </if>
       <if test="record.fileType != null">
         FILE_TYPE = #{record.fileType,jdbcType=VARCHAR},
@@ -311,9 +311,9 @@
     set ID = #{record.id,jdbcType=NUMERIC},
       CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
       CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
-      STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
-      FILE_TYPE_ID = #{record.fileTypeId,jdbcType=NUMERIC},
+      FILE_TYPE_CODE = #{record.fileTypeCode,jdbcType=VARCHAR},
       FILE_TYPE = #{record.fileType,jdbcType=VARCHAR},
       FILE_NAME = #{record.fileName,jdbcType=VARCHAR},
       PUSH_OB_ID = #{record.pushObId,jdbcType=NUMERIC},
@@ -338,14 +338,14 @@
       <if test="consignmentId != null">
         CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
       </if>
-      <if test="statusId != null">
-        STATUS_ID = #{statusId,jdbcType=NUMERIC},
+      <if test="statusCode != null">
+        STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       </if>
       <if test="statusName != null">
         STATUS_NAME = #{statusName,jdbcType=VARCHAR},
       </if>
-      <if test="fileTypeId != null">
-        FILE_TYPE_ID = #{fileTypeId,jdbcType=NUMERIC},
+      <if test="fileTypeCode != null">
+        FILE_TYPE_CODE = #{fileTypeCode,jdbcType=VARCHAR},
       </if>
       <if test="fileType != null">
         FILE_TYPE = #{fileType,jdbcType=VARCHAR},
@@ -387,9 +387,9 @@
     update T_BIZ_PUSH_OB_DETAIL
     set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
       CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
-      STATUS_ID = #{statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{statusName,jdbcType=VARCHAR},
-      FILE_TYPE_ID = #{fileTypeId,jdbcType=NUMERIC},
+      FILE_TYPE_CODE = #{fileTypeCode,jdbcType=VARCHAR},
       FILE_TYPE = #{fileType,jdbcType=VARCHAR},
       FILE_NAME = #{fileName,jdbcType=VARCHAR},
       PUSH_OB_ID = #{pushObId,jdbcType=NUMERIC},

@@ -6,7 +6,7 @@
     <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
     <result column="CONSIGNMENT_ID" jdbcType="NUMERIC" property="consignmentId" />
     <result column="PUSH_TIME" jdbcType="TIMESTAMP" property="pushTime" />
-    <result column="STATUS_ID" jdbcType="NUMERIC" property="statusId" />
+    <result column="STATUS_CODE" jdbcType="VARCHAR" property="statusCode" />
     <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
     <result column="PUSH_NUM" jdbcType="NUMERIC" property="pushNum" />
     <result column="FILE_PATH" jdbcType="VARCHAR" property="filePath" />
@@ -79,7 +79,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, PUSH_TIME, STATUS_ID, STATUS_NAME, PUSH_NUM, 
+    ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, PUSH_TIME, STATUS_CODE, STATUS_NAME, PUSH_NUM, 
     FILE_PATH, FILE_BACK_PATH, FILE_NAME, REMARK, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
     MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
   </sql>
@@ -121,13 +121,13 @@
       SELECT SEQ_T_BIZ_PUSH_OB.NEXTVAL FROM DUAL
     </selectKey>
     insert into T_BIZ_PUSH_OB (ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, 
-      PUSH_TIME, STATUS_ID, STATUS_NAME, 
+      PUSH_TIME, STATUS_CODE, STATUS_NAME, 
       PUSH_NUM, FILE_PATH, FILE_BACK_PATH, 
       FILE_NAME, REMARK, CREATE_TIME, 
       CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 
       MODIFY_USER_ID, MODIFY_USER_NAME)
     values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{consignmentId,jdbcType=NUMERIC}, 
-      #{pushTime,jdbcType=TIMESTAMP}, #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR}, 
+      #{pushTime,jdbcType=TIMESTAMP}, #{statusCode,jdbcType=VARCHAR}, #{statusName,jdbcType=VARCHAR}, 
       #{pushNum,jdbcType=NUMERIC}, #{filePath,jdbcType=VARCHAR}, #{fileBackPath,jdbcType=VARCHAR}, 
       #{fileName,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
@@ -149,8 +149,8 @@
       <if test="pushTime != null">
         PUSH_TIME,
       </if>
-      <if test="statusId != null">
-        STATUS_ID,
+      <if test="statusCode != null">
+        STATUS_CODE,
       </if>
       <if test="statusName != null">
         STATUS_NAME,
@@ -200,8 +200,8 @@
       <if test="pushTime != null">
         #{pushTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="statusId != null">
-        #{statusId,jdbcType=NUMERIC},
+      <if test="statusCode != null">
+        #{statusCode,jdbcType=VARCHAR},
       </if>
       <if test="statusName != null">
         #{statusName,jdbcType=VARCHAR},
@@ -262,8 +262,8 @@
       <if test="record.pushTime != null">
         PUSH_TIME = #{record.pushTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.statusId != null">
-        STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
+      <if test="record.statusCode != null">
+        STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       </if>
       <if test="record.statusName != null">
         STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
@@ -312,7 +312,7 @@
       CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
       CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
       PUSH_TIME = #{record.pushTime,jdbcType=TIMESTAMP},
-      STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
       PUSH_NUM = #{record.pushNum,jdbcType=NUMERIC},
       FILE_PATH = #{record.filePath,jdbcType=VARCHAR},
@@ -341,8 +341,8 @@
       <if test="pushTime != null">
         PUSH_TIME = #{pushTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="statusId != null">
-        STATUS_ID = #{statusId,jdbcType=NUMERIC},
+      <if test="statusCode != null">
+        STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       </if>
       <if test="statusName != null">
         STATUS_NAME = #{statusName,jdbcType=VARCHAR},
@@ -388,7 +388,7 @@
     set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
       CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
       PUSH_TIME = #{pushTime,jdbcType=TIMESTAMP},
-      STATUS_ID = #{statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{statusName,jdbcType=VARCHAR},
       PUSH_NUM = #{pushNum,jdbcType=NUMERIC},
       FILE_PATH = #{filePath,jdbcType=VARCHAR},

@@ -4,14 +4,15 @@
   <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.UploadRecord">
     <id column="ID" jdbcType="NUMERIC" property="id" />
     <result column="CONSIGNMENT_ID" jdbcType="NUMERIC" property="consignmentId" />
-    <result column="UPLOAD_STATUS" jdbcType="VARCHAR" property="uploadStatus" />
-    <result column="STATUS" jdbcType="NUMERIC" property="status" />
+    <result column="STATUS_CODE" jdbcType="VARCHAR" property="statusCode" />
+    <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
     <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
     <result column="CREATE_USER_ID" jdbcType="NUMERIC" property="createUserId" />
     <result column="CREATE_USER_NAME" jdbcType="VARCHAR" property="createUserName" />
     <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
     <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
+    <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -72,8 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    ID, CONSIGNMENT_ID, UPLOAD_STATUS, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
-    MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
+    ID, CONSIGNMENT_ID, STATUS_CODE, STATUS_NAME, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
+    MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, CONSIGNMENT_CODE
   </sql>
   <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.UploadRecordExample" resultMap="BaseResultMap">
     <include refid="OracleDialectPrefix" />
@@ -112,14 +113,14 @@
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
       SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL
     </selectKey>
-    insert into T_BIZ_UPLOAD_RECORD (ID, CONSIGNMENT_ID, UPLOAD_STATUS, 
-      STATUS, CREATE_TIME, CREATE_USER_ID, 
+    insert into T_BIZ_UPLOAD_RECORD (ID, CONSIGNMENT_ID, STATUS_CODE, 
+      STATUS_NAME, CREATE_TIME, CREATE_USER_ID, 
       CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 
-      MODIFY_USER_NAME)
-    values (#{id,jdbcType=NUMERIC}, #{consignmentId,jdbcType=NUMERIC}, #{uploadStatus,jdbcType=VARCHAR}, 
-      #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 
+      MODIFY_USER_NAME, CONSIGNMENT_CODE)
+    values (#{id,jdbcType=NUMERIC}, #{consignmentId,jdbcType=NUMERIC}, #{statusCode,jdbcType=VARCHAR}, 
+      #{statusName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 
       #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 
-      #{modifyUserName,jdbcType=VARCHAR})
+      #{modifyUserName,jdbcType=VARCHAR}, #{consignmentCode,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.UploadRecord">
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
@@ -131,11 +132,11 @@
       <if test="consignmentId != null">
         CONSIGNMENT_ID,
       </if>
-      <if test="uploadStatus != null">
-        UPLOAD_STATUS,
+      <if test="statusCode != null">
+        STATUS_CODE,
       </if>
-      <if test="status != null">
-        STATUS,
+      <if test="statusName != null">
+        STATUS_NAME,
       </if>
       <if test="createTime != null">
         CREATE_TIME,
@@ -155,17 +156,20 @@
       <if test="modifyUserName != null">
         MODIFY_USER_NAME,
       </if>
+      <if test="consignmentCode != null">
+        CONSIGNMENT_CODE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       #{id,jdbcType=NUMERIC},
       <if test="consignmentId != null">
         #{consignmentId,jdbcType=NUMERIC},
       </if>
-      <if test="uploadStatus != null">
-        #{uploadStatus,jdbcType=VARCHAR},
+      <if test="statusCode != null">
+        #{statusCode,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=NUMERIC},
+      <if test="statusName != null">
+        #{statusName,jdbcType=VARCHAR},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -185,6 +189,9 @@
       <if test="modifyUserName != null">
         #{modifyUserName,jdbcType=VARCHAR},
       </if>
+      <if test="consignmentCode != null">
+        #{consignmentCode,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.UploadRecordExample" resultType="java.lang.Long">
@@ -202,11 +209,11 @@
       <if test="record.consignmentId != null">
         CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
       </if>
-      <if test="record.uploadStatus != null">
-        UPLOAD_STATUS = #{record.uploadStatus,jdbcType=VARCHAR},
+      <if test="record.statusCode != null">
+        STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       </if>
-      <if test="record.status != null">
-        STATUS = #{record.status,jdbcType=NUMERIC},
+      <if test="record.statusName != null">
+        STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
       </if>
       <if test="record.createTime != null">
         CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
@@ -226,6 +233,9 @@
       <if test="record.modifyUserName != null">
         MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
       </if>
+      <if test="record.consignmentCode != null">
+        CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -235,14 +245,15 @@
     update T_BIZ_UPLOAD_RECORD
     set ID = #{record.id,jdbcType=NUMERIC},
       CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
-      UPLOAD_STATUS = #{record.uploadStatus,jdbcType=VARCHAR},
-      STATUS = #{record.status,jdbcType=NUMERIC},
+      STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
+      STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
       CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
       CREATE_USER_ID = #{record.createUserId,jdbcType=NUMERIC},
       CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
       MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
       MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
-      MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}
+      MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
+      CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -253,11 +264,11 @@
       <if test="consignmentId != null">
         CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
       </if>
-      <if test="uploadStatus != null">
-        UPLOAD_STATUS = #{uploadStatus,jdbcType=VARCHAR},
+      <if test="statusCode != null">
+        STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        STATUS = #{status,jdbcType=NUMERIC},
+      <if test="statusName != null">
+        STATUS_NAME = #{statusName,jdbcType=VARCHAR},
       </if>
       <if test="createTime != null">
         CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
@@ -277,20 +288,24 @@
       <if test="modifyUserName != null">
         MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
       </if>
+      <if test="consignmentCode != null">
+        CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
+      </if>
     </set>
     where ID = #{id,jdbcType=NUMERIC}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.biz.UploadRecord">
     update T_BIZ_UPLOAD_RECORD
     set CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
-      UPLOAD_STATUS = #{uploadStatus,jdbcType=VARCHAR},
-      STATUS = #{status,jdbcType=NUMERIC},
+      STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
+      STATUS_NAME = #{statusName,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       CREATE_USER_ID = #{createUserId,jdbcType=NUMERIC},
       CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
       MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
       MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
-      MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}
+      MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
+      CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=NUMERIC}
   </update>
   <sql id="OracleDialectPrefix">

@@ -8,9 +8,9 @@
     <result column="TO_ADDRESS" jdbcType="VARCHAR" property="toAddress" />
     <result column="CC_ADDRESS" jdbcType="VARCHAR" property="ccAddress" />
     <result column="SUBJECT" jdbcType="VARCHAR" property="subject" />
-    <result column="TYPE_ID" jdbcType="NUMERIC" property="typeId" />
+    <result column="TYPE_CODE" jdbcType="VARCHAR" property="typeCode" />
     <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" />
-    <result column="STATUS_ID" jdbcType="NUMERIC" property="statusId" />
+    <result column="STATUS_CODE" jdbcType="VARCHAR" property="statusCode" />
     <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
     <result column="SEND_NUM" jdbcType="NUMERIC" property="sendNum" />
     <result column="SEND_TIME" jdbcType="TIMESTAMP" property="sendTime" />
@@ -83,7 +83,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    ID, BIZ_ID, BIZ_CODE, TO_ADDRESS, CC_ADDRESS, SUBJECT, TYPE_ID, TYPE_NAME, STATUS_ID, 
+    ID, BIZ_ID, BIZ_CODE, TO_ADDRESS, CC_ADDRESS, SUBJECT, TYPE_CODE, TYPE_NAME, STATUS_CODE, 
     STATUS_NAME, SEND_NUM, SEND_TIME, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
     MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
   </sql>
@@ -148,14 +148,14 @@
     </selectKey>
     insert into T_LOG_EMAIL_HISTORY (ID, BIZ_ID, BIZ_CODE, 
       TO_ADDRESS, CC_ADDRESS, SUBJECT, 
-      TYPE_ID, TYPE_NAME, STATUS_ID, 
+      TYPE_CODE, TYPE_NAME, STATUS_CODE, 
       STATUS_NAME, SEND_NUM, SEND_TIME, 
       CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
       MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 
       BODY)
     values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizCode,jdbcType=VARCHAR}, 
       #{toAddress,jdbcType=VARCHAR}, #{ccAddress,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR}, 
-      #{typeId,jdbcType=NUMERIC}, #{typeName,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, 
+      #{typeCode,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR}, #{statusCode,jdbcType=VARCHAR}, 
       #{statusName,jdbcType=VARCHAR}, #{sendNum,jdbcType=NUMERIC}, #{sendTime,jdbcType=TIMESTAMP}, 
       #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, 
       #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, 
@@ -183,14 +183,14 @@
       <if test="subject != null">
         SUBJECT,
       </if>
-      <if test="typeId != null">
-        TYPE_ID,
+      <if test="typeCode != null">
+        TYPE_CODE,
       </if>
       <if test="typeName != null">
         TYPE_NAME,
       </if>
-      <if test="statusId != null">
-        STATUS_ID,
+      <if test="statusCode != null">
+        STATUS_CODE,
       </if>
       <if test="statusName != null">
         STATUS_NAME,
@@ -240,14 +240,14 @@
       <if test="subject != null">
         #{subject,jdbcType=VARCHAR},
       </if>
-      <if test="typeId != null">
-        #{typeId,jdbcType=NUMERIC},
+      <if test="typeCode != null">
+        #{typeCode,jdbcType=VARCHAR},
       </if>
       <if test="typeName != null">
         #{typeName,jdbcType=VARCHAR},
       </if>
-      <if test="statusId != null">
-        #{statusId,jdbcType=NUMERIC},
+      <if test="statusCode != null">
+        #{statusCode,jdbcType=VARCHAR},
       </if>
       <if test="statusName != null">
         #{statusName,jdbcType=VARCHAR},
@@ -308,14 +308,14 @@
       <if test="record.subject != null">
         SUBJECT = #{record.subject,jdbcType=VARCHAR},
       </if>
-      <if test="record.typeId != null">
-        TYPE_ID = #{record.typeId,jdbcType=NUMERIC},
+      <if test="record.typeCode != null">
+        TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
       </if>
       <if test="record.typeName != null">
         TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
       </if>
-      <if test="record.statusId != null">
-        STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
+      <if test="record.statusCode != null">
+        STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       </if>
       <if test="record.statusName != null">
         STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
@@ -360,9 +360,9 @@
       TO_ADDRESS = #{record.toAddress,jdbcType=VARCHAR},
       CC_ADDRESS = #{record.ccAddress,jdbcType=VARCHAR},
       SUBJECT = #{record.subject,jdbcType=VARCHAR},
-      TYPE_ID = #{record.typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
-      STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
       SEND_NUM = #{record.sendNum,jdbcType=NUMERIC},
       SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP},
@@ -385,9 +385,9 @@
       TO_ADDRESS = #{record.toAddress,jdbcType=VARCHAR},
       CC_ADDRESS = #{record.ccAddress,jdbcType=VARCHAR},
       SUBJECT = #{record.subject,jdbcType=VARCHAR},
-      TYPE_ID = #{record.typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
-      STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
       SEND_NUM = #{record.sendNum,jdbcType=NUMERIC},
       SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP},
@@ -419,14 +419,14 @@
       <if test="subject != null">
         SUBJECT = #{subject,jdbcType=VARCHAR},
       </if>
-      <if test="typeId != null">
-        TYPE_ID = #{typeId,jdbcType=NUMERIC},
+      <if test="typeCode != null">
+        TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
       </if>
       <if test="typeName != null">
         TYPE_NAME = #{typeName,jdbcType=VARCHAR},
       </if>
-      <if test="statusId != null">
-        STATUS_ID = #{statusId,jdbcType=NUMERIC},
+      <if test="statusCode != null">
+        STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       </if>
       <if test="statusName != null">
         STATUS_NAME = #{statusName,jdbcType=VARCHAR},
@@ -468,9 +468,9 @@
       TO_ADDRESS = #{toAddress,jdbcType=VARCHAR},
       CC_ADDRESS = #{ccAddress,jdbcType=VARCHAR},
       SUBJECT = #{subject,jdbcType=VARCHAR},
-      TYPE_ID = #{typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{typeName,jdbcType=VARCHAR},
-      STATUS_ID = #{statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{statusName,jdbcType=VARCHAR},
       SEND_NUM = #{sendNum,jdbcType=NUMERIC},
       SEND_TIME = #{sendTime,jdbcType=TIMESTAMP},
@@ -490,9 +490,9 @@
       TO_ADDRESS = #{toAddress,jdbcType=VARCHAR},
       CC_ADDRESS = #{ccAddress,jdbcType=VARCHAR},
       SUBJECT = #{subject,jdbcType=VARCHAR},
-      TYPE_ID = #{typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{typeName,jdbcType=VARCHAR},
-      STATUS_ID = #{statusId,jdbcType=NUMERIC},
+      STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
       STATUS_NAME = #{statusName,jdbcType=VARCHAR},
       SEND_NUM = #{sendNum,jdbcType=NUMERIC},
       SEND_TIME = #{sendTime,jdbcType=TIMESTAMP},

@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.log.UserLoginInfo">
     <id column="ID" jdbcType="NUMERIC" property="id" />
     <result column="USER_ID" jdbcType="NUMERIC" property="userId" />
-    <result column="OPER_TYPE_ID" jdbcType="NUMERIC" property="operTypeId" />
+    <result column="OPER_TYPE_CODE" jdbcType="VARCHAR" property="operTypeCode" />
     <result column="OPER_TYPE_NAME" jdbcType="VARCHAR" property="operTypeName" />
     <result column="OPER_DESC" jdbcType="VARCHAR" property="operDesc" />
     <result column="IP" jdbcType="VARCHAR" property="ip" />
@@ -74,7 +74,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    ID, USER_ID, OPER_TYPE_ID, OPER_TYPE_NAME, OPER_DESC, IP, CREATE_TIME, CREATE_USER_ID, 
+    ID, USER_ID, OPER_TYPE_CODE, OPER_TYPE_NAME, OPER_DESC, IP, CREATE_TIME, CREATE_USER_ID, 
     CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
   </sql>
   <select id="selectByExample" parameterType="com.fedex.connect.common.model.log.UserLoginInfoExample" resultMap="BaseResultMap">
@@ -114,12 +114,12 @@
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
       SELECT SEQ_T_LOG_USER_LOGIN_INFO.NEXTVAL FROM DUAL
     </selectKey>
-    insert into T_LOG_USER_LOGIN_INFO (ID, USER_ID, OPER_TYPE_ID, 
+    insert into T_LOG_USER_LOGIN_INFO (ID, USER_ID, OPER_TYPE_CODE, 
       OPER_TYPE_NAME, OPER_DESC, IP, 
       CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
       MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
       )
-    values (#{id,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC}, #{operTypeId,jdbcType=NUMERIC}, 
+    values (#{id,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC}, #{operTypeCode,jdbcType=VARCHAR}, 
       #{operTypeName,jdbcType=VARCHAR}, #{operDesc,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, 
       #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}
@@ -135,8 +135,8 @@
       <if test="userId != null">
         USER_ID,
       </if>
-      <if test="operTypeId != null">
-        OPER_TYPE_ID,
+      <if test="operTypeCode != null">
+        OPER_TYPE_CODE,
       </if>
       <if test="operTypeName != null">
         OPER_TYPE_NAME,
@@ -171,8 +171,8 @@
       <if test="userId != null">
         #{userId,jdbcType=NUMERIC},
       </if>
-      <if test="operTypeId != null">
-        #{operTypeId,jdbcType=NUMERIC},
+      <if test="operTypeCode != null">
+        #{operTypeCode,jdbcType=VARCHAR},
       </if>
       <if test="operTypeName != null">
         #{operTypeName,jdbcType=VARCHAR},
@@ -218,8 +218,8 @@
       <if test="record.userId != null">
         USER_ID = #{record.userId,jdbcType=NUMERIC},
       </if>
-      <if test="record.operTypeId != null">
-        OPER_TYPE_ID = #{record.operTypeId,jdbcType=NUMERIC},
+      <if test="record.operTypeCode != null">
+        OPER_TYPE_CODE = #{record.operTypeCode,jdbcType=VARCHAR},
       </if>
       <if test="record.operTypeName != null">
         OPER_TYPE_NAME = #{record.operTypeName,jdbcType=VARCHAR},
@@ -257,7 +257,7 @@
     update T_LOG_USER_LOGIN_INFO
     set ID = #{record.id,jdbcType=NUMERIC},
       USER_ID = #{record.userId,jdbcType=NUMERIC},
-      OPER_TYPE_ID = #{record.operTypeId,jdbcType=NUMERIC},
+      OPER_TYPE_CODE = #{record.operTypeCode,jdbcType=VARCHAR},
       OPER_TYPE_NAME = #{record.operTypeName,jdbcType=VARCHAR},
       OPER_DESC = #{record.operDesc,jdbcType=VARCHAR},
       IP = #{record.ip,jdbcType=VARCHAR},
@@ -277,8 +277,8 @@
       <if test="userId != null">
         USER_ID = #{userId,jdbcType=NUMERIC},
       </if>
-      <if test="operTypeId != null">
-        OPER_TYPE_ID = #{operTypeId,jdbcType=NUMERIC},
+      <if test="operTypeCode != null">
+        OPER_TYPE_CODE = #{operTypeCode,jdbcType=VARCHAR},
       </if>
       <if test="operTypeName != null">
         OPER_TYPE_NAME = #{operTypeName,jdbcType=VARCHAR},
@@ -313,7 +313,7 @@
   <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.log.UserLoginInfo">
     update T_LOG_USER_LOGIN_INFO
     set USER_ID = #{userId,jdbcType=NUMERIC},
-      OPER_TYPE_ID = #{operTypeId,jdbcType=NUMERIC},
+      OPER_TYPE_CODE = #{operTypeCode,jdbcType=VARCHAR},
       OPER_TYPE_NAME = #{operTypeName,jdbcType=VARCHAR},
       OPER_DESC = #{operDesc,jdbcType=VARCHAR},
       IP = #{ip,jdbcType=VARCHAR},

@@ -98,7 +98,7 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from T_SYS_KAFKA_TEMPORARY_STORAGE
+    from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -114,7 +114,7 @@
     </if>
     'true' as QUERYID,
     <include refid="Base_Column_List" />
-    from T_SYS_KAFKA_TEMPORARY_STORAGE
+    from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -128,15 +128,15 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from T_SYS_KAFKA_TEMPORARY_STORAGE
+    from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     where ID = #{id,jdbcType=NUMERIC}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from T_SYS_KAFKA_TEMPORARY_STORAGE
+    delete from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     where ID = #{id,jdbcType=NUMERIC}
   </delete>
   <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorageExample">
-    delete from T_SYS_KAFKA_TEMPORARY_STORAGE
+    delete from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -145,7 +145,7 @@
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
       SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL
     </selectKey>
-    insert into T_SYS_KAFKA_TEMPORARY_STORAGE (ID, MESSAGE_ID, MESSAGE_CODE, 
+    insert into ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE (ID, MESSAGE_ID, MESSAGE_CODE, 
       SENDER_ID, RECEIVER_ID, SEND_TIME, 
       CONSIGNMENT_CODE, FREQUENCY, STATUS, 
       STATUS_NAME, REMARK, CREATE_TIME, 
@@ -164,7 +164,7 @@
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
       SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL
     </selectKey>
-    insert into T_SYS_KAFKA_TEMPORARY_STORAGE
+    insert into ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     <trim prefix="(" suffix=")" suffixOverrides=",">
       ID,
       <if test="messageId != null">
@@ -275,13 +275,13 @@
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorageExample" resultType="java.lang.Long">
-    select count(*) from T_SYS_KAFKA_TEMPORARY_STORAGE
+    select count(*) from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update T_SYS_KAFKA_TEMPORARY_STORAGE
+    update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     <set>
       <if test="record.id != null">
         ID = #{record.id,jdbcType=NUMERIC},
@@ -343,7 +343,7 @@
     </if>
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
-    update T_SYS_KAFKA_TEMPORARY_STORAGE
+    update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     set ID = #{record.id,jdbcType=NUMERIC},
       MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR},
       MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR},
@@ -367,7 +367,7 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update T_SYS_KAFKA_TEMPORARY_STORAGE
+    update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     set ID = #{record.id,jdbcType=NUMERIC},
       MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR},
       MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR},
@@ -390,7 +390,7 @@
     </if>
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage">
-    update T_SYS_KAFKA_TEMPORARY_STORAGE
+    update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     <set>
       <if test="messageId != null">
         MESSAGE_ID = #{messageId,jdbcType=VARCHAR},
@@ -447,7 +447,7 @@
     where ID = #{id,jdbcType=NUMERIC}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage">
-    update T_SYS_KAFKA_TEMPORARY_STORAGE
+    update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     set MESSAGE_ID = #{messageId,jdbcType=VARCHAR},
       MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR},
       SENDER_ID = #{senderId,jdbcType=VARCHAR},
@@ -468,7 +468,7 @@
     where ID = #{id,jdbcType=NUMERIC}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage">
-    update T_SYS_KAFKA_TEMPORARY_STORAGE
+    update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
     set MESSAGE_ID = #{messageId,jdbcType=VARCHAR},
       MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR},
       SENDER_ID = #{senderId,jdbcType=VARCHAR},

@@ -6,7 +6,7 @@
     <result column="CODE" jdbcType="VARCHAR" property="code" />
     <result column="NAME" jdbcType="VARCHAR" property="name" />
     <result column="VALUE" jdbcType="VARCHAR" property="value" />
-    <result column="TYPE_ID" jdbcType="NUMERIC" property="typeId" />
+    <result column="TYPE_CODE" jdbcType="VARCHAR" property="typeCode" />
     <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" />
     <result column="STATUS" jdbcType="NUMERIC" property="status" />
     <result column="DESCRIPTION" jdbcType="VARCHAR" property="description" />
@@ -76,7 +76,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    ID, CODE, NAME, VALUE, TYPE_ID, TYPE_NAME, STATUS, DESCRIPTION, CREATE_TIME, CREATE_USER_ID, 
+    ID, CODE, NAME, VALUE, TYPE_CODE, TYPE_NAME, STATUS, DESCRIPTION, CREATE_TIME, CREATE_USER_ID, 
     CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
   </sql>
   <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.ParamConfigExample" resultMap="BaseResultMap">
@@ -117,12 +117,12 @@
       SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL
     </selectKey>
     insert into ICLEARIMP.T_SYS_PARAM_CONFIG (ID, CODE, NAME, 
-      VALUE, TYPE_ID, TYPE_NAME, 
+      VALUE, TYPE_CODE, TYPE_NAME, 
       STATUS, DESCRIPTION, CREATE_TIME, 
       CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 
       MODIFY_USER_ID, MODIFY_USER_NAME)
     values (#{id,jdbcType=NUMERIC}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
-      #{value,jdbcType=VARCHAR}, #{typeId,jdbcType=NUMERIC}, #{typeName,jdbcType=VARCHAR}, 
+      #{value,jdbcType=VARCHAR}, #{typeCode,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR}, 
       #{status,jdbcType=NUMERIC}, #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
       #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR})
@@ -143,8 +143,8 @@
       <if test="value != null">
         VALUE,
       </if>
-      <if test="typeId != null">
-        TYPE_ID,
+      <if test="typeCode != null">
+        TYPE_CODE,
       </if>
       <if test="typeName != null">
         TYPE_NAME,
@@ -185,8 +185,8 @@
       <if test="value != null">
         #{value,jdbcType=VARCHAR},
       </if>
-      <if test="typeId != null">
-        #{typeId,jdbcType=NUMERIC},
+      <if test="typeCode != null">
+        #{typeCode,jdbcType=VARCHAR},
       </if>
       <if test="typeName != null">
         #{typeName,jdbcType=VARCHAR},
@@ -238,8 +238,8 @@
       <if test="record.value != null">
         VALUE = #{record.value,jdbcType=VARCHAR},
       </if>
-      <if test="record.typeId != null">
-        TYPE_ID = #{record.typeId,jdbcType=NUMERIC},
+      <if test="record.typeCode != null">
+        TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
       </if>
       <if test="record.typeName != null">
         TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
@@ -279,7 +279,7 @@
       CODE = #{record.code,jdbcType=VARCHAR},
       NAME = #{record.name,jdbcType=VARCHAR},
       VALUE = #{record.value,jdbcType=VARCHAR},
-      TYPE_ID = #{record.typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
       STATUS = #{record.status,jdbcType=NUMERIC},
       DESCRIPTION = #{record.description,jdbcType=VARCHAR},
@@ -305,8 +305,8 @@
       <if test="value != null">
         VALUE = #{value,jdbcType=VARCHAR},
       </if>
-      <if test="typeId != null">
-        TYPE_ID = #{typeId,jdbcType=NUMERIC},
+      <if test="typeCode != null">
+        TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
       </if>
       <if test="typeName != null">
         TYPE_NAME = #{typeName,jdbcType=VARCHAR},
@@ -343,7 +343,7 @@
     set CODE = #{code,jdbcType=VARCHAR},
       NAME = #{name,jdbcType=VARCHAR},
       VALUE = #{value,jdbcType=VARCHAR},
-      TYPE_ID = #{typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{typeName,jdbcType=VARCHAR},
       STATUS = #{status,jdbcType=NUMERIC},
       DESCRIPTION = #{description,jdbcType=VARCHAR},

@@ -6,7 +6,7 @@
     <result column="CODE" jdbcType="VARCHAR" property="code" />
     <result column="NAME" jdbcType="VARCHAR" property="name" />
     <result column="ROLE_DESC" jdbcType="VARCHAR" property="roleDesc" />
-    <result column="TYPE_ID" jdbcType="NUMERIC" property="typeId" />
+    <result column="TYPE_CODE" jdbcType="VARCHAR" property="typeCode" />
     <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" />
     <result column="STATUS" jdbcType="NUMERIC" property="status" />
     <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
@@ -75,7 +75,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    ID, CODE, NAME, ROLE_DESC, TYPE_ID, TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID, 
+    ID, CODE, NAME, ROLE_DESC, TYPE_CODE, TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID, 
     CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
   </sql>
   <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.RoleExample" resultMap="BaseResultMap">
@@ -116,12 +116,12 @@
       SELECT SEQ_T_SYS_ROLE.NEXTVAL FROM DUAL
     </selectKey>
     insert into T_SYS_ROLE (ID, CODE, NAME, 
-      ROLE_DESC, TYPE_ID, TYPE_NAME, 
+      ROLE_DESC, TYPE_CODE, TYPE_NAME, 
       STATUS, CREATE_TIME, CREATE_USER_ID, 
       CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 
       MODIFY_USER_NAME)
     values (#{id,jdbcType=NUMERIC}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
-      #{roleDesc,jdbcType=VARCHAR}, #{typeId,jdbcType=NUMERIC}, #{typeName,jdbcType=VARCHAR}, 
+      #{roleDesc,jdbcType=VARCHAR}, #{typeCode,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR}, 
       #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 
       #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 
       #{modifyUserName,jdbcType=VARCHAR})
@@ -142,8 +142,8 @@
       <if test="roleDesc != null">
         ROLE_DESC,
       </if>
-      <if test="typeId != null">
-        TYPE_ID,
+      <if test="typeCode != null">
+        TYPE_CODE,
       </if>
       <if test="typeName != null">
         TYPE_NAME,
@@ -181,8 +181,8 @@
       <if test="roleDesc != null">
         #{roleDesc,jdbcType=VARCHAR},
       </if>
-      <if test="typeId != null">
-        #{typeId,jdbcType=NUMERIC},
+      <if test="typeCode != null">
+        #{typeCode,jdbcType=VARCHAR},
       </if>
       <if test="typeName != null">
         #{typeName,jdbcType=VARCHAR},
@@ -231,8 +231,8 @@
       <if test="record.roleDesc != null">
         ROLE_DESC = #{record.roleDesc,jdbcType=VARCHAR},
       </if>
-      <if test="record.typeId != null">
-        TYPE_ID = #{record.typeId,jdbcType=NUMERIC},
+      <if test="record.typeCode != null">
+        TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
       </if>
       <if test="record.typeName != null">
         TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
@@ -269,7 +269,7 @@
       CODE = #{record.code,jdbcType=VARCHAR},
       NAME = #{record.name,jdbcType=VARCHAR},
       ROLE_DESC = #{record.roleDesc,jdbcType=VARCHAR},
-      TYPE_ID = #{record.typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
       STATUS = #{record.status,jdbcType=NUMERIC},
       CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
@@ -294,8 +294,8 @@
       <if test="roleDesc != null">
         ROLE_DESC = #{roleDesc,jdbcType=VARCHAR},
       </if>
-      <if test="typeId != null">
-        TYPE_ID = #{typeId,jdbcType=NUMERIC},
+      <if test="typeCode != null">
+        TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
       </if>
       <if test="typeName != null">
         TYPE_NAME = #{typeName,jdbcType=VARCHAR},
@@ -329,7 +329,7 @@
     set CODE = #{code,jdbcType=VARCHAR},
       NAME = #{name,jdbcType=VARCHAR},
       ROLE_DESC = #{roleDesc,jdbcType=VARCHAR},
-      TYPE_ID = #{typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{typeName,jdbcType=VARCHAR},
       STATUS = #{status,jdbcType=NUMERIC},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},

@@ -13,7 +13,7 @@
     <result column="ACCOUNT_NO" jdbcType="VARCHAR" property="accountNo" />
     <result column="UNIFIED_BUSINESS_NUM" jdbcType="VARCHAR" property="unifiedBusinessNum" />
     <result column="CUSTOMS_SERIAL_NUM" jdbcType="VARCHAR" property="customsSerialNum" />
-    <result column="TYPE_ID" jdbcType="NUMERIC" property="typeId" />
+    <result column="TYPE_CODE" jdbcType="VARCHAR" property="typeCode" />
     <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" />
     <result column="STATUS" jdbcType="NUMERIC" property="status" />
     <result column="REMARK" jdbcType="VARCHAR" property="remark" />
@@ -85,7 +85,7 @@
   </sql>
   <sql id="Base_Column_List">
     ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPANY_NAME, ACCOUNT_NO, 
-    UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_ID, TYPE_NAME, STATUS, REMARK, CREATE_TIME, 
+    UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_CODE, TYPE_NAME, STATUS, REMARK, CREATE_TIME, 
     CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 
     CONFIRM_PROMPTS
   </sql>
@@ -129,7 +129,7 @@
     insert into ICLEARIMP.T_SYS_USER (ID, LOGIN_NAME, USER_NAME, 
       PASSWORD, USER_UUID, EMAIL, 
       PHONE, COMPANY_NAME, ACCOUNT_NO, 
-      UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_ID, 
+      UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_CODE, 
       TYPE_NAME, STATUS, REMARK, 
       CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 
       MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 
@@ -137,7 +137,7 @@
     values (#{id,jdbcType=NUMERIC}, #{loginName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
       #{phone,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR}, 
-      #{unifiedBusinessNum,jdbcType=VARCHAR}, #{customsSerialNum,jdbcType=VARCHAR}, #{typeId,jdbcType=NUMERIC}, 
+      #{unifiedBusinessNum,jdbcType=VARCHAR}, #{customsSerialNum,jdbcType=VARCHAR}, #{typeCode,jdbcType=VARCHAR}, 
       #{typeName,jdbcType=VARCHAR}, #{status,jdbcType=NUMERIC}, #{remark,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, 
       #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, 
@@ -180,8 +180,8 @@
       <if test="customsSerialNum != null">
         CUSTOMS_SERIAL_NUM,
       </if>
-      <if test="typeId != null">
-        TYPE_ID,
+      <if test="typeCode != null">
+        TYPE_CODE,
       </if>
       <if test="typeName != null">
         TYPE_NAME,
@@ -246,8 +246,8 @@
       <if test="customsSerialNum != null">
         #{customsSerialNum,jdbcType=VARCHAR},
       </if>
-      <if test="typeId != null">
-        #{typeId,jdbcType=NUMERIC},
+      <if test="typeCode != null">
+        #{typeCode,jdbcType=VARCHAR},
       </if>
       <if test="typeName != null">
         #{typeName,jdbcType=VARCHAR},
@@ -323,8 +323,8 @@
       <if test="record.customsSerialNum != null">
         CUSTOMS_SERIAL_NUM = #{record.customsSerialNum,jdbcType=VARCHAR},
       </if>
-      <if test="record.typeId != null">
-        TYPE_ID = #{record.typeId,jdbcType=NUMERIC},
+      <if test="record.typeCode != null">
+        TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
       </if>
       <if test="record.typeName != null">
         TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
@@ -374,7 +374,7 @@
       ACCOUNT_NO = #{record.accountNo,jdbcType=VARCHAR},
       UNIFIED_BUSINESS_NUM = #{record.unifiedBusinessNum,jdbcType=VARCHAR},
       CUSTOMS_SERIAL_NUM = #{record.customsSerialNum,jdbcType=VARCHAR},
-      TYPE_ID = #{record.typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
       STATUS = #{record.status,jdbcType=NUMERIC},
       REMARK = #{record.remark,jdbcType=VARCHAR},
@@ -422,8 +422,8 @@
       <if test="customsSerialNum != null">
         CUSTOMS_SERIAL_NUM = #{customsSerialNum,jdbcType=VARCHAR},
       </if>
-      <if test="typeId != null">
-        TYPE_ID = #{typeId,jdbcType=NUMERIC},
+      <if test="typeCode != null">
+        TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
       </if>
       <if test="typeName != null">
         TYPE_NAME = #{typeName,jdbcType=VARCHAR},
@@ -470,7 +470,7 @@
       ACCOUNT_NO = #{accountNo,jdbcType=VARCHAR},
       UNIFIED_BUSINESS_NUM = #{unifiedBusinessNum,jdbcType=VARCHAR},
       CUSTOMS_SERIAL_NUM = #{customsSerialNum,jdbcType=VARCHAR},
-      TYPE_ID = #{typeId,jdbcType=NUMERIC},
+      TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
       TYPE_NAME = #{typeName,jdbcType=VARCHAR},
       STATUS = #{status,jdbcType=NUMERIC},
       REMARK = #{remark,jdbcType=VARCHAR},

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fedex.connect.common.dao.sys.RedisSlabMapper">
-  <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.sys.RedisSlab">
+<mapper namespace="com.fedex.connect.common.dao.sys.redisSlabMapper">
+  <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.sys.redisSlab">
     <id column="ID" jdbcType="NUMERIC" property="id" />
     <result column="REDIS_KEY" jdbcType="VARCHAR" property="redisKey" />
     <result column="REDIS_MSG" jdbcType="VARCHAR" property="redisMsg" />
@@ -76,7 +76,7 @@
     ID, REDIS_KEY, REDIS_MSG, VALID_DURATION, DIS_TIME, CREATE_TIME, CREATE_USER_ID, 
     CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
   </sql>
-  <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.RedisSlabExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.redisSlabExample" resultMap="BaseResultMap">
     <include refid="OracleDialectPrefix" />
     select
     <if test="distinct">
@@ -103,13 +103,13 @@
     delete from T_SYS_REDIS_SLAB
     where ID = #{id,jdbcType=NUMERIC}
   </delete>
-  <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.RedisSlabExample">
+  <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.redisSlabExample">
     delete from T_SYS_REDIS_SLAB
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.fedex.connect.common.model.sys.RedisSlab">
+  <insert id="insert" parameterType="com.fedex.connect.common.model.sys.redisSlab">
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
       SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL
     </selectKey>
@@ -122,7 +122,7 @@
       #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
       #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.RedisSlab">
+  <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.redisSlab">
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
       SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL
     </selectKey>
@@ -194,7 +194,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.RedisSlabExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.redisSlabExample" resultType="java.lang.Long">
     select count(*) from T_SYS_REDIS_SLAB
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -258,7 +258,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.RedisSlab">
+  <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.redisSlab">
     update T_SYS_REDIS_SLAB
     <set>
       <if test="redisKey != null">
@@ -294,7 +294,7 @@
     </set>
     where ID = #{id,jdbcType=NUMERIC}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.RedisSlab">
+  <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.redisSlab">
     update T_SYS_REDIS_SLAB
     set REDIS_KEY = #{redisKey,jdbcType=VARCHAR},
       REDIS_MSG = #{redisMsg,jdbcType=VARCHAR},

-package com.fedex.connect.common.model.bi;
\ No newline at end of file

@@ -19,10 +19,10 @@ public class Attachment implements Serializable {
     private Long bizId;
 
     /**
-     * 业务类型ID。
+     * 业务类型CODE。
 关联数据字典表。指定字典目录CODE：ATTACHMENT_BIZ_TYPE
      */
-    private Long bizTypeId;
+    private String bizTypeCode;
 
     /**
      * 业务类型名称(用户上传、系统生成)
@@ -45,9 +45,9 @@ public class Attachment implements Serializable {
     private String filePath;
 
     /**
-     * 文件类型ID。关联数据字典表。指定字典目录CODE：ATTACHMENT_FILE_TYPE
+     * 文件类型CODE。关联数据字典表。指定字典目录CODE：ATTACHMENT_FILE_TYPE
      */
-    private Long fileTypeId;
+    private String fileTypeCode;
 
     /**
      * 文件类型名称(压缩包、PDF)
@@ -94,6 +94,11 @@ public class Attachment implements Serializable {
      */
     private Long uploadRecordId;
 
+    /**
+     * 文件大小byte
+     */
+    private Long fileSize;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -112,12 +117,12 @@ public class Attachment implements Serializable {
         this.bizId = bizId;
     }
 
-    public Long getBizTypeId() {
-        return bizTypeId;
+    public String getBizTypeCode() {
+        return bizTypeCode;
     }
 
-    public void setBizTypeId(Long bizTypeId) {
-        this.bizTypeId = bizTypeId;
+    public void setBizTypeCode(String bizTypeCode) {
+        this.bizTypeCode = bizTypeCode == null ? null : bizTypeCode.trim();
     }
 
     public String getBizTypeName() {
@@ -152,12 +157,12 @@ public class Attachment implements Serializable {
         this.filePath = filePath == null ? null : filePath.trim();
     }
 
-    public Long getFileTypeId() {
-        return fileTypeId;
+    public String getFileTypeCode() {
+        return fileTypeCode;
     }
 
-    public void setFileTypeId(Long fileTypeId) {
-        this.fileTypeId = fileTypeId;
+    public void setFileTypeCode(String fileTypeCode) {
+        this.fileTypeCode = fileTypeCode == null ? null : fileTypeCode.trim();
     }
 
     public String getFileTypeName() {
@@ -232,6 +237,14 @@ public class Attachment implements Serializable {
         this.uploadRecordId = uploadRecordId;
     }
 
+    public Long getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(Long fileSize) {
+        this.fileSize = fileSize;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -240,12 +253,12 @@ public class Attachment implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", bizId=").append(bizId);
-        sb.append(", bizTypeId=").append(bizTypeId);
+        sb.append(", bizTypeCode=").append(bizTypeCode);
         sb.append(", bizTypeName=").append(bizTypeName);
         sb.append(", sourceFileName=").append(sourceFileName);
         sb.append(", fileName=").append(fileName);
         sb.append(", filePath=").append(filePath);
-        sb.append(", fileTypeId=").append(fileTypeId);
+        sb.append(", fileTypeCode=").append(fileTypeCode);
         sb.append(", fileTypeName=").append(fileTypeName);
         sb.append(", status=").append(status);
         sb.append(", createTime=").append(createTime);
@@ -255,6 +268,7 @@ public class Attachment implements Serializable {
         sb.append(", modifyUserId=").append(modifyUserId);
         sb.append(", modifyUserName=").append(modifyUserName);
         sb.append(", uploadRecordId=").append(uploadRecordId);
+        sb.append(", fileSize=").append(fileSize);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

@@ -245,63 +245,73 @@ public class AttachmentExample {
             return (Criteria) this;
         }
 
-        public Criteria andBizTypeIdIsNull() {
-            addCriterion("BIZ_TYPE_ID is null");
+        public Criteria andBizTypeCodeIsNull() {
+            addCriterion("BIZ_TYPE_CODE is null");
             return (Criteria) this;
         }
 
-        public Criteria andBizTypeIdIsNotNull() {
-            addCriterion("BIZ_TYPE_ID is not null");
+        public Criteria andBizTypeCodeIsNotNull() {
+            addCriterion("BIZ_TYPE_CODE is not null");
             return (Criteria) this;
         }
 
-        public Criteria andBizTypeIdEqualTo(Long value) {
-            addCriterion("BIZ_TYPE_ID =", value, "bizTypeId");
+        public Criteria andBizTypeCodeEqualTo(String value) {
+            addCriterion("BIZ_TYPE_CODE =", value, "bizTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andBizTypeIdNotEqualTo(Long value) {
-            addCriterion("BIZ_TYPE_ID <>", value, "bizTypeId");
+        public Criteria andBizTypeCodeNotEqualTo(String value) {
+            addCriterion("BIZ_TYPE_CODE <>", value, "bizTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andBizTypeIdGreaterThan(Long value) {
-            addCriterion("BIZ_TYPE_ID >", value, "bizTypeId");
+        public Criteria andBizTypeCodeGreaterThan(String value) {
+            addCriterion("BIZ_TYPE_CODE >", value, "bizTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andBizTypeIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("BIZ_TYPE_ID >=", value, "bizTypeId");
+        public Criteria andBizTypeCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("BIZ_TYPE_CODE >=", value, "bizTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andBizTypeIdLessThan(Long value) {
-            addCriterion("BIZ_TYPE_ID <", value, "bizTypeId");
+        public Criteria andBizTypeCodeLessThan(String value) {
+            addCriterion("BIZ_TYPE_CODE <", value, "bizTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andBizTypeIdLessThanOrEqualTo(Long value) {
-            addCriterion("BIZ_TYPE_ID <=", value, "bizTypeId");
+        public Criteria andBizTypeCodeLessThanOrEqualTo(String value) {
+            addCriterion("BIZ_TYPE_CODE <=", value, "bizTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andBizTypeIdIn(List<Long> values) {
-            addCriterion("BIZ_TYPE_ID in", values, "bizTypeId");
+        public Criteria andBizTypeCodeLike(String value) {
+            addCriterion("BIZ_TYPE_CODE like", value, "bizTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andBizTypeIdNotIn(List<Long> values) {
-            addCriterion("BIZ_TYPE_ID not in", values, "bizTypeId");
+        public Criteria andBizTypeCodeNotLike(String value) {
+            addCriterion("BIZ_TYPE_CODE not like", value, "bizTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andBizTypeIdBetween(Long value1, Long value2) {
-            addCriterion("BIZ_TYPE_ID between", value1, value2, "bizTypeId");
+        public Criteria andBizTypeCodeIn(List<String> values) {
+            addCriterion("BIZ_TYPE_CODE in", values, "bizTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andBizTypeIdNotBetween(Long value1, Long value2) {
-            addCriterion("BIZ_TYPE_ID not between", value1, value2, "bizTypeId");
+        public Criteria andBizTypeCodeNotIn(List<String> values) {
+            addCriterion("BIZ_TYPE_CODE not in", values, "bizTypeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizTypeCodeBetween(String value1, String value2) {
+            addCriterion("BIZ_TYPE_CODE between", value1, value2, "bizTypeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizTypeCodeNotBetween(String value1, String value2) {
+            addCriterion("BIZ_TYPE_CODE not between", value1, value2, "bizTypeCode");
             return (Criteria) this;
         }
 
@@ -585,63 +595,73 @@ public class AttachmentExample {
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdIsNull() {
-            addCriterion("FILE_TYPE_ID is null");
+        public Criteria andFileTypeCodeIsNull() {
+            addCriterion("FILE_TYPE_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeCodeIsNotNull() {
+            addCriterion("FILE_TYPE_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeCodeEqualTo(String value) {
+            addCriterion("FILE_TYPE_CODE =", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdIsNotNull() {
-            addCriterion("FILE_TYPE_ID is not null");
+        public Criteria andFileTypeCodeNotEqualTo(String value) {
+            addCriterion("FILE_TYPE_CODE <>", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdEqualTo(Long value) {
-            addCriterion("FILE_TYPE_ID =", value, "fileTypeId");
+        public Criteria andFileTypeCodeGreaterThan(String value) {
+            addCriterion("FILE_TYPE_CODE >", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdNotEqualTo(Long value) {
-            addCriterion("FILE_TYPE_ID <>", value, "fileTypeId");
+        public Criteria andFileTypeCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("FILE_TYPE_CODE >=", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdGreaterThan(Long value) {
-            addCriterion("FILE_TYPE_ID >", value, "fileTypeId");
+        public Criteria andFileTypeCodeLessThan(String value) {
+            addCriterion("FILE_TYPE_CODE <", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("FILE_TYPE_ID >=", value, "fileTypeId");
+        public Criteria andFileTypeCodeLessThanOrEqualTo(String value) {
+            addCriterion("FILE_TYPE_CODE <=", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdLessThan(Long value) {
-            addCriterion("FILE_TYPE_ID <", value, "fileTypeId");
+        public Criteria andFileTypeCodeLike(String value) {
+            addCriterion("FILE_TYPE_CODE like", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdLessThanOrEqualTo(Long value) {
-            addCriterion("FILE_TYPE_ID <=", value, "fileTypeId");
+        public Criteria andFileTypeCodeNotLike(String value) {
+            addCriterion("FILE_TYPE_CODE not like", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdIn(List<Long> values) {
-            addCriterion("FILE_TYPE_ID in", values, "fileTypeId");
+        public Criteria andFileTypeCodeIn(List<String> values) {
+            addCriterion("FILE_TYPE_CODE in", values, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdNotIn(List<Long> values) {
-            addCriterion("FILE_TYPE_ID not in", values, "fileTypeId");
+        public Criteria andFileTypeCodeNotIn(List<String> values) {
+            addCriterion("FILE_TYPE_CODE not in", values, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdBetween(Long value1, Long value2) {
-            addCriterion("FILE_TYPE_ID between", value1, value2, "fileTypeId");
+        public Criteria andFileTypeCodeBetween(String value1, String value2) {
+            addCriterion("FILE_TYPE_CODE between", value1, value2, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdNotBetween(Long value1, Long value2) {
-            addCriterion("FILE_TYPE_ID not between", value1, value2, "fileTypeId");
+        public Criteria andFileTypeCodeNotBetween(String value1, String value2) {
+            addCriterion("FILE_TYPE_CODE not between", value1, value2, "fileTypeCode");
             return (Criteria) this;
         }
 
@@ -1214,6 +1234,66 @@ public class AttachmentExample {
             addCriterion("UPLOAD_RECORD_ID not between", value1, value2, "uploadRecordId");
             return (Criteria) this;
         }
+
+        public Criteria andFileSizeIsNull() {
+            addCriterion("FILE_SIZE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileSizeIsNotNull() {
+            addCriterion("FILE_SIZE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileSizeEqualTo(Long value) {
+            addCriterion("FILE_SIZE =", value, "fileSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileSizeNotEqualTo(Long value) {
+            addCriterion("FILE_SIZE <>", value, "fileSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileSizeGreaterThan(Long value) {
+            addCriterion("FILE_SIZE >", value, "fileSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileSizeGreaterThanOrEqualTo(Long value) {
+            addCriterion("FILE_SIZE >=", value, "fileSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileSizeLessThan(Long value) {
+            addCriterion("FILE_SIZE <", value, "fileSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileSizeLessThanOrEqualTo(Long value) {
+            addCriterion("FILE_SIZE <=", value, "fileSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileSizeIn(List<Long> values) {
+            addCriterion("FILE_SIZE in", values, "fileSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileSizeNotIn(List<Long> values) {
+            addCriterion("FILE_SIZE not in", values, "fileSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileSizeBetween(Long value1, Long value2) {
+            addCriterion("FILE_SIZE between", value1, value2, "fileSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileSizeNotBetween(Long value1, Long value2) {
+            addCriterion("FILE_SIZE not between", value1, value2, "fileSize");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

@@ -30,16 +30,6 @@ public class CeInfo implements Serializable {
     private Date shipDate;
 
     /**
-     * 发货人国家
-     */
-    private String shipperCountry;
-
-    /**
-     * 收件人国家
-     */
-    private String recipientCountry;
-
-    /**
      * 目的国口岸
      */
     private String destIataCode;
@@ -75,16 +65,6 @@ public class CeInfo implements Serializable {
     private String modifyUserName;
 
     /**
-     * 原产国全称
-     */
-    private String originCountry;
-
-    /**
-     * 目的国全称
-     */
-    private String destinationCountry;
-
-    /**
      * 申报币制
      */
     private String customsCurrency;
@@ -194,6 +174,26 @@ public class CeInfo implements Serializable {
      */
     private String docNondocFlag;
 
+    /**
+     * 用户UUID
+     */
+    private String userUuid;
+
+    /**
+     * 发件人邮箱
+     */
+    private String shipperEmail;
+
+    /**
+     * 发货人国家二字码
+     */
+    private String shipperCountry;
+
+    /**
+     * 收件人国家二字码
+     */
+    private String recipientCountry;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -228,22 +228,6 @@ public class CeInfo implements Serializable {
         this.shipDate = shipDate;
     }
 
-    public String getShipperCountry() {
-        return shipperCountry;
-    }
-
-    public void setShipperCountry(String shipperCountry) {
-        this.shipperCountry = shipperCountry == null ? null : shipperCountry.trim();
-    }
-
-    public String getRecipientCountry() {
-        return recipientCountry;
-    }
-
-    public void setRecipientCountry(String recipientCountry) {
-        this.recipientCountry = recipientCountry == null ? null : recipientCountry.trim();
-    }
-
     public String getDestIataCode() {
         return destIataCode;
     }
@@ -300,22 +284,6 @@ public class CeInfo implements Serializable {
         this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
     }
 
-    public String getOriginCountry() {
-        return originCountry;
-    }
-
-    public void setOriginCountry(String originCountry) {
-        this.originCountry = originCountry == null ? null : originCountry.trim();
-    }
-
-    public String getDestinationCountry() {
-        return destinationCountry;
-    }
-
-    public void setDestinationCountry(String destinationCountry) {
-        this.destinationCountry = destinationCountry == null ? null : destinationCountry.trim();
-    }
-
     public String getCustomsCurrency() {
         return customsCurrency;
     }
@@ -492,6 +460,38 @@ public class CeInfo implements Serializable {
         this.docNondocFlag = docNondocFlag == null ? null : docNondocFlag.trim();
     }
 
+    public String getUserUuid() {
+        return userUuid;
+    }
+
+    public void setUserUuid(String userUuid) {
+        this.userUuid = userUuid == null ? null : userUuid.trim();
+    }
+
+    public String getShipperEmail() {
+        return shipperEmail;
+    }
+
+    public void setShipperEmail(String shipperEmail) {
+        this.shipperEmail = shipperEmail == null ? null : shipperEmail.trim();
+    }
+
+    public String getShipperCountry() {
+        return shipperCountry;
+    }
+
+    public void setShipperCountry(String shipperCountry) {
+        this.shipperCountry = shipperCountry == null ? null : shipperCountry.trim();
+    }
+
+    public String getRecipientCountry() {
+        return recipientCountry;
+    }
+
+    public void setRecipientCountry(String recipientCountry) {
+        this.recipientCountry = recipientCountry == null ? null : recipientCountry.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -502,8 +502,6 @@ public class CeInfo implements Serializable {
         sb.append(", consignmentCode=").append(consignmentCode);
         sb.append(", sendTime=").append(sendTime);
         sb.append(", shipDate=").append(shipDate);
-        sb.append(", shipperCountry=").append(shipperCountry);
-        sb.append(", recipientCountry=").append(recipientCountry);
         sb.append(", destIataCode=").append(destIataCode);
         sb.append(", createTime=").append(createTime);
         sb.append(", createUserId=").append(createUserId);
@@ -511,8 +509,6 @@ public class CeInfo implements Serializable {
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", modifyUserId=").append(modifyUserId);
         sb.append(", modifyUserName=").append(modifyUserName);
-        sb.append(", originCountry=").append(originCountry);
-        sb.append(", destinationCountry=").append(destinationCountry);
         sb.append(", customsCurrency=").append(customsCurrency);
         sb.append(", customsValue=").append(customsValue);
         sb.append(", weight=").append(weight);
@@ -535,6 +531,10 @@ public class CeInfo implements Serializable {
         sb.append(", recipientCity=").append(recipientCity);
         sb.append(", recipientPostalCode=").append(recipientPostalCode);
         sb.append(", docNondocFlag=").append(docNondocFlag);
+        sb.append(", userUuid=").append(userUuid);
+        sb.append(", shipperEmail=").append(shipperEmail);
+        sb.append(", shipperCountry=").append(shipperCountry);
+        sb.append(", recipientCountry=").append(recipientCountry);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

@@ -376,146 +376,6 @@ public class CeInfoExample {
             return (Criteria) this;
         }
 
-        public Criteria andShipperCountryIsNull() {
-            addCriterion("SHIPPER_COUNTRY is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryIsNotNull() {
-            addCriterion("SHIPPER_COUNTRY is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryEqualTo(String value) {
-            addCriterion("SHIPPER_COUNTRY =", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryNotEqualTo(String value) {
-            addCriterion("SHIPPER_COUNTRY <>", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryGreaterThan(String value) {
-            addCriterion("SHIPPER_COUNTRY >", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryGreaterThanOrEqualTo(String value) {
-            addCriterion("SHIPPER_COUNTRY >=", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryLessThan(String value) {
-            addCriterion("SHIPPER_COUNTRY <", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryLessThanOrEqualTo(String value) {
-            addCriterion("SHIPPER_COUNTRY <=", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryLike(String value) {
-            addCriterion("SHIPPER_COUNTRY like", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryNotLike(String value) {
-            addCriterion("SHIPPER_COUNTRY not like", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryIn(List<String> values) {
-            addCriterion("SHIPPER_COUNTRY in", values, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryNotIn(List<String> values) {
-            addCriterion("SHIPPER_COUNTRY not in", values, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryBetween(String value1, String value2) {
-            addCriterion("SHIPPER_COUNTRY between", value1, value2, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryNotBetween(String value1, String value2) {
-            addCriterion("SHIPPER_COUNTRY not between", value1, value2, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryIsNull() {
-            addCriterion("RECIPIENT_COUNTRY is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryIsNotNull() {
-            addCriterion("RECIPIENT_COUNTRY is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryEqualTo(String value) {
-            addCriterion("RECIPIENT_COUNTRY =", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryNotEqualTo(String value) {
-            addCriterion("RECIPIENT_COUNTRY <>", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryGreaterThan(String value) {
-            addCriterion("RECIPIENT_COUNTRY >", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryGreaterThanOrEqualTo(String value) {
-            addCriterion("RECIPIENT_COUNTRY >=", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryLessThan(String value) {
-            addCriterion("RECIPIENT_COUNTRY <", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryLessThanOrEqualTo(String value) {
-            addCriterion("RECIPIENT_COUNTRY <=", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryLike(String value) {
-            addCriterion("RECIPIENT_COUNTRY like", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryNotLike(String value) {
-            addCriterion("RECIPIENT_COUNTRY not like", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryIn(List<String> values) {
-            addCriterion("RECIPIENT_COUNTRY in", values, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryNotIn(List<String> values) {
-            addCriterion("RECIPIENT_COUNTRY not in", values, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryBetween(String value1, String value2) {
-            addCriterion("RECIPIENT_COUNTRY between", value1, value2, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryNotBetween(String value1, String value2) {
-            addCriterion("RECIPIENT_COUNTRY not between", value1, value2, "recipientCountry");
-            return (Criteria) this;
-        }
-
         public Criteria andDestIataCodeIsNull() {
             addCriterion("DEST_IATA_CODE is null");
             return (Criteria) this;
@@ -966,146 +826,6 @@ public class CeInfoExample {
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIsNull() {
-            addCriterion("ORIGIN_COUNTRY is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryIsNotNull() {
-            addCriterion("ORIGIN_COUNTRY is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryEqualTo(String value) {
-            addCriterion("ORIGIN_COUNTRY =", value, "originCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryNotEqualTo(String value) {
-            addCriterion("ORIGIN_COUNTRY <>", value, "originCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryGreaterThan(String value) {
-            addCriterion("ORIGIN_COUNTRY >", value, "originCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryGreaterThanOrEqualTo(String value) {
-            addCriterion("ORIGIN_COUNTRY >=", value, "originCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryLessThan(String value) {
-            addCriterion("ORIGIN_COUNTRY <", value, "originCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryLessThanOrEqualTo(String value) {
-            addCriterion("ORIGIN_COUNTRY <=", value, "originCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryLike(String value) {
-            addCriterion("ORIGIN_COUNTRY like", value, "originCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryNotLike(String value) {
-            addCriterion("ORIGIN_COUNTRY not like", value, "originCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryIn(List<String> values) {
-            addCriterion("ORIGIN_COUNTRY in", values, "originCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryNotIn(List<String> values) {
-            addCriterion("ORIGIN_COUNTRY not in", values, "originCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryBetween(String value1, String value2) {
-            addCriterion("ORIGIN_COUNTRY between", value1, value2, "originCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andOriginCountryNotBetween(String value1, String value2) {
-            addCriterion("ORIGIN_COUNTRY not between", value1, value2, "originCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryIsNull() {
-            addCriterion("DESTINATION_COUNTRY is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryIsNotNull() {
-            addCriterion("DESTINATION_COUNTRY is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryEqualTo(String value) {
-            addCriterion("DESTINATION_COUNTRY =", value, "destinationCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryNotEqualTo(String value) {
-            addCriterion("DESTINATION_COUNTRY <>", value, "destinationCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryGreaterThan(String value) {
-            addCriterion("DESTINATION_COUNTRY >", value, "destinationCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryGreaterThanOrEqualTo(String value) {
-            addCriterion("DESTINATION_COUNTRY >=", value, "destinationCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryLessThan(String value) {
-            addCriterion("DESTINATION_COUNTRY <", value, "destinationCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryLessThanOrEqualTo(String value) {
-            addCriterion("DESTINATION_COUNTRY <=", value, "destinationCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryLike(String value) {
-            addCriterion("DESTINATION_COUNTRY like", value, "destinationCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryNotLike(String value) {
-            addCriterion("DESTINATION_COUNTRY not like", value, "destinationCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryIn(List<String> values) {
-            addCriterion("DESTINATION_COUNTRY in", values, "destinationCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryNotIn(List<String> values) {
-            addCriterion("DESTINATION_COUNTRY not in", values, "destinationCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryBetween(String value1, String value2) {
-            addCriterion("DESTINATION_COUNTRY between", value1, value2, "destinationCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andDestinationCountryNotBetween(String value1, String value2) {
-            addCriterion("DESTINATION_COUNTRY not between", value1, value2, "destinationCountry");
-            return (Criteria) this;
-        }
-
         public Criteria andCustomsCurrencyIsNull() {
             addCriterion("CUSTOMS_CURRENCY is null");
             return (Criteria) this;
@@ -2615,6 +2335,286 @@ public class CeInfoExample {
             addCriterion("DOC_NONDOC_FLAG not between", value1, value2, "docNondocFlag");
             return (Criteria) this;
         }
+
+        public Criteria andUserUuidIsNull() {
+            addCriterion("USER_UUID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidIsNotNull() {
+            addCriterion("USER_UUID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidEqualTo(String value) {
+            addCriterion("USER_UUID =", value, "userUuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidNotEqualTo(String value) {
+            addCriterion("USER_UUID <>", value, "userUuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidGreaterThan(String value) {
+            addCriterion("USER_UUID >", value, "userUuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidGreaterThanOrEqualTo(String value) {
+            addCriterion("USER_UUID >=", value, "userUuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidLessThan(String value) {
+            addCriterion("USER_UUID <", value, "userUuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidLessThanOrEqualTo(String value) {
+            addCriterion("USER_UUID <=", value, "userUuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidLike(String value) {
+            addCriterion("USER_UUID like", value, "userUuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidNotLike(String value) {
+            addCriterion("USER_UUID not like", value, "userUuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidIn(List<String> values) {
+            addCriterion("USER_UUID in", values, "userUuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidNotIn(List<String> values) {
+            addCriterion("USER_UUID not in", values, "userUuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidBetween(String value1, String value2) {
+            addCriterion("USER_UUID between", value1, value2, "userUuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserUuidNotBetween(String value1, String value2) {
+            addCriterion("USER_UUID not between", value1, value2, "userUuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailIsNull() {
+            addCriterion("SHIPPER_EMAIL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailIsNotNull() {
+            addCriterion("SHIPPER_EMAIL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailEqualTo(String value) {
+            addCriterion("SHIPPER_EMAIL =", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailNotEqualTo(String value) {
+            addCriterion("SHIPPER_EMAIL <>", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailGreaterThan(String value) {
+            addCriterion("SHIPPER_EMAIL >", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailGreaterThanOrEqualTo(String value) {
+            addCriterion("SHIPPER_EMAIL >=", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailLessThan(String value) {
+            addCriterion("SHIPPER_EMAIL <", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailLessThanOrEqualTo(String value) {
+            addCriterion("SHIPPER_EMAIL <=", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailLike(String value) {
+            addCriterion("SHIPPER_EMAIL like", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailNotLike(String value) {
+            addCriterion("SHIPPER_EMAIL not like", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailIn(List<String> values) {
+            addCriterion("SHIPPER_EMAIL in", values, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailNotIn(List<String> values) {
+            addCriterion("SHIPPER_EMAIL not in", values, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailBetween(String value1, String value2) {
+            addCriterion("SHIPPER_EMAIL between", value1, value2, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailNotBetween(String value1, String value2) {
+            addCriterion("SHIPPER_EMAIL not between", value1, value2, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryIsNull() {
+            addCriterion("SHIPPER_COUNTRY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryIsNotNull() {
+            addCriterion("SHIPPER_COUNTRY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryEqualTo(String value) {
+            addCriterion("SHIPPER_COUNTRY =", value, "shipperCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryNotEqualTo(String value) {
+            addCriterion("SHIPPER_COUNTRY <>", value, "shipperCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryGreaterThan(String value) {
+            addCriterion("SHIPPER_COUNTRY >", value, "shipperCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryGreaterThanOrEqualTo(String value) {
+            addCriterion("SHIPPER_COUNTRY >=", value, "shipperCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryLessThan(String value) {
+            addCriterion("SHIPPER_COUNTRY <", value, "shipperCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryLessThanOrEqualTo(String value) {
+            addCriterion("SHIPPER_COUNTRY <=", value, "shipperCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryLike(String value) {
+            addCriterion("SHIPPER_COUNTRY like", value, "shipperCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryNotLike(String value) {
+            addCriterion("SHIPPER_COUNTRY not like", value, "shipperCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryIn(List<String> values) {
+            addCriterion("SHIPPER_COUNTRY in", values, "shipperCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryNotIn(List<String> values) {
+            addCriterion("SHIPPER_COUNTRY not in", values, "shipperCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryBetween(String value1, String value2) {
+            addCriterion("SHIPPER_COUNTRY between", value1, value2, "shipperCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperCountryNotBetween(String value1, String value2) {
+            addCriterion("SHIPPER_COUNTRY not between", value1, value2, "shipperCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryIsNull() {
+            addCriterion("RECIPIENT_COUNTRY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryIsNotNull() {
+            addCriterion("RECIPIENT_COUNTRY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryEqualTo(String value) {
+            addCriterion("RECIPIENT_COUNTRY =", value, "recipientCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryNotEqualTo(String value) {
+            addCriterion("RECIPIENT_COUNTRY <>", value, "recipientCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryGreaterThan(String value) {
+            addCriterion("RECIPIENT_COUNTRY >", value, "recipientCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryGreaterThanOrEqualTo(String value) {
+            addCriterion("RECIPIENT_COUNTRY >=", value, "recipientCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryLessThan(String value) {
+            addCriterion("RECIPIENT_COUNTRY <", value, "recipientCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryLessThanOrEqualTo(String value) {
+            addCriterion("RECIPIENT_COUNTRY <=", value, "recipientCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryLike(String value) {
+            addCriterion("RECIPIENT_COUNTRY like", value, "recipientCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryNotLike(String value) {
+            addCriterion("RECIPIENT_COUNTRY not like", value, "recipientCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryIn(List<String> values) {
+            addCriterion("RECIPIENT_COUNTRY in", values, "recipientCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryNotIn(List<String> values) {
+            addCriterion("RECIPIENT_COUNTRY not in", values, "recipientCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryBetween(String value1, String value2) {
+            addCriterion("RECIPIENT_COUNTRY between", value1, value2, "recipientCountry");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecipientCountryNotBetween(String value1, String value2) {
+            addCriterion("RECIPIENT_COUNTRY not between", value1, value2, "recipientCountry");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

@@ -25,16 +25,6 @@ public class Consignment implements Serializable {
     private Date shipDate;
 
     /**
-     * 发货人国家
-     */
-    private String shipperCountry;
-
-    /**
-     * 收件人国家
-     */
-    private String recipientCountry;
-
-    /**
      * 目的国口岸
      */
     private String destIataCode;
@@ -220,13 +210,13 @@ public class Consignment implements Serializable {
     private String recipientPostalCode;
 
     /**
-     * 运单状态ID，
+     * 运单状态CODE，
 关联数据字典表。指定字典目录CODE：CONSIGNMENT_STATUS
      */
-    private Long statusId;
+    private String statusCode;
 
     /**
-     * 运单状态名称(待上传、已上传、已发送)
+     * 运单状态名称(上传成功、上传失败)
      */
     private String statusName;
 
@@ -246,21 +236,31 @@ public class Consignment implements Serializable {
     private String userInputShipperAccount;
 
     /**
+     * 用户录入原产国全称CODE,关联数据字典表。指定字典目录CODE：COUNTRY
+     */
+    private String userInputOriginCountryCode;
+
+    /**
      * 用户录入原产国全称
      */
-    private Long userInputOriginCountryId;
+    private String userInputOriginCountry;
 
     /**
-     * 用户录入原产国全称ID，
+     * 原产国全称CODE，
 关联数据字典表。指定字典目录CODE：COUNTRY
      */
-    private String userInputOriginCountry;
+    private String originCountryCode;
 
     /**
-     * 原产国全称ID，
+     * 发件人邮箱
+     */
+    private String shipperEmail;
+
+    /**
+     * 目的国全称CODE，
 关联数据字典表。指定字典目录CODE：COUNTRY
      */
-    private Long originCountryId;
+    private String destinationCountryCode;
 
     private static final long serialVersionUID = 1L;
 
@@ -288,22 +288,6 @@ public class Consignment implements Serializable {
         this.shipDate = shipDate;
     }
 
-    public String getShipperCountry() {
-        return shipperCountry;
-    }
-
-    public void setShipperCountry(String shipperCountry) {
-        this.shipperCountry = shipperCountry == null ? null : shipperCountry.trim();
-    }
-
-    public String getRecipientCountry() {
-        return recipientCountry;
-    }
-
-    public void setRecipientCountry(String recipientCountry) {
-        this.recipientCountry = recipientCountry == null ? null : recipientCountry.trim();
-    }
-
     public String getDestIataCode() {
         return destIataCode;
     }
@@ -600,12 +584,12 @@ public class Consignment implements Serializable {
         this.recipientPostalCode = recipientPostalCode == null ? null : recipientPostalCode.trim();
     }
 
-    public Long getStatusId() {
-        return statusId;
+    public String getStatusCode() {
+        return statusCode;
     }
 
-    public void setStatusId(Long statusId) {
-        this.statusId = statusId;
+    public void setStatusCode(String statusCode) {
+        this.statusCode = statusCode == null ? null : statusCode.trim();
     }
 
     public String getStatusName() {
@@ -640,12 +624,12 @@ public class Consignment implements Serializable {
         this.userInputShipperAccount = userInputShipperAccount == null ? null : userInputShipperAccount.trim();
     }
 
-    public Long getUserInputOriginCountryId() {
-        return userInputOriginCountryId;
+    public String getUserInputOriginCountryCode() {
+        return userInputOriginCountryCode;
     }
 
-    public void setUserInputOriginCountryId(Long userInputOriginCountryId) {
-        this.userInputOriginCountryId = userInputOriginCountryId;
+    public void setUserInputOriginCountryCode(String userInputOriginCountryCode) {
+        this.userInputOriginCountryCode = userInputOriginCountryCode == null ? null : userInputOriginCountryCode.trim();
     }
 
     public String getUserInputOriginCountry() {
@@ -656,12 +640,28 @@ public class Consignment implements Serializable {
         this.userInputOriginCountry = userInputOriginCountry == null ? null : userInputOriginCountry.trim();
     }
 
-    public Long getOriginCountryId() {
-        return originCountryId;
+    public String getOriginCountryCode() {
+        return originCountryCode;
+    }
+
+    public void setOriginCountryCode(String originCountryCode) {
+        this.originCountryCode = originCountryCode == null ? null : originCountryCode.trim();
+    }
+
+    public String getShipperEmail() {
+        return shipperEmail;
+    }
+
+    public void setShipperEmail(String shipperEmail) {
+        this.shipperEmail = shipperEmail == null ? null : shipperEmail.trim();
+    }
+
+    public String getDestinationCountryCode() {
+        return destinationCountryCode;
     }
 
-    public void setOriginCountryId(Long originCountryId) {
-        this.originCountryId = originCountryId;
+    public void setDestinationCountryCode(String destinationCountryCode) {
+        this.destinationCountryCode = destinationCountryCode == null ? null : destinationCountryCode.trim();
     }
 
     @Override
@@ -673,8 +673,6 @@ public class Consignment implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", consignmentCode=").append(consignmentCode);
         sb.append(", shipDate=").append(shipDate);
-        sb.append(", shipperCountry=").append(shipperCountry);
-        sb.append(", recipientCountry=").append(recipientCountry);
         sb.append(", destIataCode=").append(destIataCode);
         sb.append(", originCountry=").append(originCountry);
         sb.append(", destinationCountry=").append(destinationCountry);
@@ -712,14 +710,16 @@ public class Consignment implements Serializable {
         sb.append(", modifyUserName=").append(modifyUserName);
         sb.append(", ceInfoId=").append(ceInfoId);
         sb.append(", recipientPostalCode=").append(recipientPostalCode);
-        sb.append(", statusId=").append(statusId);
+        sb.append(", statusCode=").append(statusCode);
         sb.append(", statusName=").append(statusName);
         sb.append(", docNondocFlag=").append(docNondocFlag);
         sb.append(", userUuid=").append(userUuid);
         sb.append(", userInputShipperAccount=").append(userInputShipperAccount);
-        sb.append(", userInputOriginCountryId=").append(userInputOriginCountryId);
+        sb.append(", userInputOriginCountryCode=").append(userInputOriginCountryCode);
         sb.append(", userInputOriginCountry=").append(userInputOriginCountry);
-        sb.append(", originCountryId=").append(originCountryId);
+        sb.append(", originCountryCode=").append(originCountryCode);
+        sb.append(", shipperEmail=").append(shipperEmail);
+        sb.append(", destinationCountryCode=").append(destinationCountryCode);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

@@ -316,146 +316,6 @@ public class ConsignmentExample {
             return (Criteria) this;
         }
 
-        public Criteria andShipperCountryIsNull() {
-            addCriterion("SHIPPER_COUNTRY is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryIsNotNull() {
-            addCriterion("SHIPPER_COUNTRY is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryEqualTo(String value) {
-            addCriterion("SHIPPER_COUNTRY =", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryNotEqualTo(String value) {
-            addCriterion("SHIPPER_COUNTRY <>", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryGreaterThan(String value) {
-            addCriterion("SHIPPER_COUNTRY >", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryGreaterThanOrEqualTo(String value) {
-            addCriterion("SHIPPER_COUNTRY >=", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryLessThan(String value) {
-            addCriterion("SHIPPER_COUNTRY <", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryLessThanOrEqualTo(String value) {
-            addCriterion("SHIPPER_COUNTRY <=", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryLike(String value) {
-            addCriterion("SHIPPER_COUNTRY like", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryNotLike(String value) {
-            addCriterion("SHIPPER_COUNTRY not like", value, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryIn(List<String> values) {
-            addCriterion("SHIPPER_COUNTRY in", values, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryNotIn(List<String> values) {
-            addCriterion("SHIPPER_COUNTRY not in", values, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryBetween(String value1, String value2) {
-            addCriterion("SHIPPER_COUNTRY between", value1, value2, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andShipperCountryNotBetween(String value1, String value2) {
-            addCriterion("SHIPPER_COUNTRY not between", value1, value2, "shipperCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryIsNull() {
-            addCriterion("RECIPIENT_COUNTRY is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryIsNotNull() {
-            addCriterion("RECIPIENT_COUNTRY is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryEqualTo(String value) {
-            addCriterion("RECIPIENT_COUNTRY =", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryNotEqualTo(String value) {
-            addCriterion("RECIPIENT_COUNTRY <>", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryGreaterThan(String value) {
-            addCriterion("RECIPIENT_COUNTRY >", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryGreaterThanOrEqualTo(String value) {
-            addCriterion("RECIPIENT_COUNTRY >=", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryLessThan(String value) {
-            addCriterion("RECIPIENT_COUNTRY <", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryLessThanOrEqualTo(String value) {
-            addCriterion("RECIPIENT_COUNTRY <=", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryLike(String value) {
-            addCriterion("RECIPIENT_COUNTRY like", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryNotLike(String value) {
-            addCriterion("RECIPIENT_COUNTRY not like", value, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryIn(List<String> values) {
-            addCriterion("RECIPIENT_COUNTRY in", values, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryNotIn(List<String> values) {
-            addCriterion("RECIPIENT_COUNTRY not in", values, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryBetween(String value1, String value2) {
-            addCriterion("RECIPIENT_COUNTRY between", value1, value2, "recipientCountry");
-            return (Criteria) this;
-        }
-
-        public Criteria andRecipientCountryNotBetween(String value1, String value2) {
-            addCriterion("RECIPIENT_COUNTRY not between", value1, value2, "recipientCountry");
-            return (Criteria) this;
-        }
-
         public Criteria andDestIataCodeIsNull() {
             addCriterion("DEST_IATA_CODE is null");
             return (Criteria) this;
@@ -2926,63 +2786,73 @@ public class ConsignmentExample {
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIsNull() {
-            addCriterion("STATUS_ID is null");
+        public Criteria andStatusCodeIsNull() {
+            addCriterion("STATUS_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusCodeIsNotNull() {
+            addCriterion("STATUS_CODE is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIsNotNull() {
-            addCriterion("STATUS_ID is not null");
+        public Criteria andStatusCodeEqualTo(String value) {
+            addCriterion("STATUS_CODE =", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdEqualTo(Long value) {
-            addCriterion("STATUS_ID =", value, "statusId");
+        public Criteria andStatusCodeNotEqualTo(String value) {
+            addCriterion("STATUS_CODE <>", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotEqualTo(Long value) {
-            addCriterion("STATUS_ID <>", value, "statusId");
+        public Criteria andStatusCodeGreaterThan(String value) {
+            addCriterion("STATUS_CODE >", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdGreaterThan(Long value) {
-            addCriterion("STATUS_ID >", value, "statusId");
+        public Criteria andStatusCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("STATUS_CODE >=", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("STATUS_ID >=", value, "statusId");
+        public Criteria andStatusCodeLessThan(String value) {
+            addCriterion("STATUS_CODE <", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdLessThan(Long value) {
-            addCriterion("STATUS_ID <", value, "statusId");
+        public Criteria andStatusCodeLessThanOrEqualTo(String value) {
+            addCriterion("STATUS_CODE <=", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdLessThanOrEqualTo(Long value) {
-            addCriterion("STATUS_ID <=", value, "statusId");
+        public Criteria andStatusCodeLike(String value) {
+            addCriterion("STATUS_CODE like", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIn(List<Long> values) {
-            addCriterion("STATUS_ID in", values, "statusId");
+        public Criteria andStatusCodeNotLike(String value) {
+            addCriterion("STATUS_CODE not like", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotIn(List<Long> values) {
-            addCriterion("STATUS_ID not in", values, "statusId");
+        public Criteria andStatusCodeIn(List<String> values) {
+            addCriterion("STATUS_CODE in", values, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdBetween(Long value1, Long value2) {
-            addCriterion("STATUS_ID between", value1, value2, "statusId");
+        public Criteria andStatusCodeNotIn(List<String> values) {
+            addCriterion("STATUS_CODE not in", values, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotBetween(Long value1, Long value2) {
-            addCriterion("STATUS_ID not between", value1, value2, "statusId");
+        public Criteria andStatusCodeBetween(String value1, String value2) {
+            addCriterion("STATUS_CODE between", value1, value2, "statusCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusCodeNotBetween(String value1, String value2) {
+            addCriterion("STATUS_CODE not between", value1, value2, "statusCode");
             return (Criteria) this;
         }
 
@@ -3266,63 +3136,73 @@ public class ConsignmentExample {
             return (Criteria) this;
         }
 
-        public Criteria andUserInputOriginCountryIdIsNull() {
-            addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID is null");
+        public Criteria andUserInputOriginCountryCodeIsNull() {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserInputOriginCountryCodeIsNotNull() {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUserInputOriginCountryIdIsNotNull() {
-            addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID is not null");
+        public Criteria andUserInputOriginCountryCodeEqualTo(String value) {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE =", value, "userInputOriginCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andUserInputOriginCountryIdEqualTo(Long value) {
-            addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID =", value, "userInputOriginCountryId");
+        public Criteria andUserInputOriginCountryCodeNotEqualTo(String value) {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE <>", value, "userInputOriginCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andUserInputOriginCountryIdNotEqualTo(Long value) {
-            addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID <>", value, "userInputOriginCountryId");
+        public Criteria andUserInputOriginCountryCodeGreaterThan(String value) {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE >", value, "userInputOriginCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andUserInputOriginCountryIdGreaterThan(Long value) {
-            addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID >", value, "userInputOriginCountryId");
+        public Criteria andUserInputOriginCountryCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE >=", value, "userInputOriginCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andUserInputOriginCountryIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID >=", value, "userInputOriginCountryId");
+        public Criteria andUserInputOriginCountryCodeLessThan(String value) {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE <", value, "userInputOriginCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andUserInputOriginCountryIdLessThan(Long value) {
-            addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID <", value, "userInputOriginCountryId");
+        public Criteria andUserInputOriginCountryCodeLessThanOrEqualTo(String value) {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE <=", value, "userInputOriginCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andUserInputOriginCountryIdLessThanOrEqualTo(Long value) {
-            addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID <=", value, "userInputOriginCountryId");
+        public Criteria andUserInputOriginCountryCodeLike(String value) {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE like", value, "userInputOriginCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andUserInputOriginCountryIdIn(List<Long> values) {
-            addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID in", values, "userInputOriginCountryId");
+        public Criteria andUserInputOriginCountryCodeNotLike(String value) {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE not like", value, "userInputOriginCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andUserInputOriginCountryIdNotIn(List<Long> values) {
-            addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID not in", values, "userInputOriginCountryId");
+        public Criteria andUserInputOriginCountryCodeIn(List<String> values) {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE in", values, "userInputOriginCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andUserInputOriginCountryIdBetween(Long value1, Long value2) {
-            addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID between", value1, value2, "userInputOriginCountryId");
+        public Criteria andUserInputOriginCountryCodeNotIn(List<String> values) {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE not in", values, "userInputOriginCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andUserInputOriginCountryIdNotBetween(Long value1, Long value2) {
-            addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID not between", value1, value2, "userInputOriginCountryId");
+        public Criteria andUserInputOriginCountryCodeBetween(String value1, String value2) {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE between", value1, value2, "userInputOriginCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserInputOriginCountryCodeNotBetween(String value1, String value2) {
+            addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE not between", value1, value2, "userInputOriginCountryCode");
             return (Criteria) this;
         }
 
@@ -3396,63 +3276,213 @@ public class ConsignmentExample {
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIdIsNull() {
-            addCriterion("ORIGIN_COUNTRY_ID is null");
+        public Criteria andOriginCountryCodeIsNull() {
+            addCriterion("ORIGIN_COUNTRY_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeIsNotNull() {
+            addCriterion("ORIGIN_COUNTRY_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeEqualTo(String value) {
+            addCriterion("ORIGIN_COUNTRY_CODE =", value, "originCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeNotEqualTo(String value) {
+            addCriterion("ORIGIN_COUNTRY_CODE <>", value, "originCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeGreaterThan(String value) {
+            addCriterion("ORIGIN_COUNTRY_CODE >", value, "originCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("ORIGIN_COUNTRY_CODE >=", value, "originCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeLessThan(String value) {
+            addCriterion("ORIGIN_COUNTRY_CODE <", value, "originCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeLessThanOrEqualTo(String value) {
+            addCriterion("ORIGIN_COUNTRY_CODE <=", value, "originCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeLike(String value) {
+            addCriterion("ORIGIN_COUNTRY_CODE like", value, "originCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeNotLike(String value) {
+            addCriterion("ORIGIN_COUNTRY_CODE not like", value, "originCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeIn(List<String> values) {
+            addCriterion("ORIGIN_COUNTRY_CODE in", values, "originCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeNotIn(List<String> values) {
+            addCriterion("ORIGIN_COUNTRY_CODE not in", values, "originCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeBetween(String value1, String value2) {
+            addCriterion("ORIGIN_COUNTRY_CODE between", value1, value2, "originCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginCountryCodeNotBetween(String value1, String value2) {
+            addCriterion("ORIGIN_COUNTRY_CODE not between", value1, value2, "originCountryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailIsNull() {
+            addCriterion("SHIPPER_EMAIL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailIsNotNull() {
+            addCriterion("SHIPPER_EMAIL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailEqualTo(String value) {
+            addCriterion("SHIPPER_EMAIL =", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailNotEqualTo(String value) {
+            addCriterion("SHIPPER_EMAIL <>", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailGreaterThan(String value) {
+            addCriterion("SHIPPER_EMAIL >", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailGreaterThanOrEqualTo(String value) {
+            addCriterion("SHIPPER_EMAIL >=", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailLessThan(String value) {
+            addCriterion("SHIPPER_EMAIL <", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailLessThanOrEqualTo(String value) {
+            addCriterion("SHIPPER_EMAIL <=", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailLike(String value) {
+            addCriterion("SHIPPER_EMAIL like", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailNotLike(String value) {
+            addCriterion("SHIPPER_EMAIL not like", value, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailIn(List<String> values) {
+            addCriterion("SHIPPER_EMAIL in", values, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailNotIn(List<String> values) {
+            addCriterion("SHIPPER_EMAIL not in", values, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailBetween(String value1, String value2) {
+            addCriterion("SHIPPER_EMAIL between", value1, value2, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperEmailNotBetween(String value1, String value2) {
+            addCriterion("SHIPPER_EMAIL not between", value1, value2, "shipperEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestinationCountryCodeIsNull() {
+            addCriterion("DESTINATION_COUNTRY_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestinationCountryCodeIsNotNull() {
+            addCriterion("DESTINATION_COUNTRY_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestinationCountryCodeEqualTo(String value) {
+            addCriterion("DESTINATION_COUNTRY_CODE =", value, "destinationCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIdIsNotNull() {
-            addCriterion("ORIGIN_COUNTRY_ID is not null");
+        public Criteria andDestinationCountryCodeNotEqualTo(String value) {
+            addCriterion("DESTINATION_COUNTRY_CODE <>", value, "destinationCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIdEqualTo(Long value) {
-            addCriterion("ORIGIN_COUNTRY_ID =", value, "originCountryId");
+        public Criteria andDestinationCountryCodeGreaterThan(String value) {
+            addCriterion("DESTINATION_COUNTRY_CODE >", value, "destinationCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIdNotEqualTo(Long value) {
-            addCriterion("ORIGIN_COUNTRY_ID <>", value, "originCountryId");
+        public Criteria andDestinationCountryCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("DESTINATION_COUNTRY_CODE >=", value, "destinationCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIdGreaterThan(Long value) {
-            addCriterion("ORIGIN_COUNTRY_ID >", value, "originCountryId");
+        public Criteria andDestinationCountryCodeLessThan(String value) {
+            addCriterion("DESTINATION_COUNTRY_CODE <", value, "destinationCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("ORIGIN_COUNTRY_ID >=", value, "originCountryId");
+        public Criteria andDestinationCountryCodeLessThanOrEqualTo(String value) {
+            addCriterion("DESTINATION_COUNTRY_CODE <=", value, "destinationCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIdLessThan(Long value) {
-            addCriterion("ORIGIN_COUNTRY_ID <", value, "originCountryId");
+        public Criteria andDestinationCountryCodeLike(String value) {
+            addCriterion("DESTINATION_COUNTRY_CODE like", value, "destinationCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIdLessThanOrEqualTo(Long value) {
-            addCriterion("ORIGIN_COUNTRY_ID <=", value, "originCountryId");
+        public Criteria andDestinationCountryCodeNotLike(String value) {
+            addCriterion("DESTINATION_COUNTRY_CODE not like", value, "destinationCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIdIn(List<Long> values) {
-            addCriterion("ORIGIN_COUNTRY_ID in", values, "originCountryId");
+        public Criteria andDestinationCountryCodeIn(List<String> values) {
+            addCriterion("DESTINATION_COUNTRY_CODE in", values, "destinationCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIdNotIn(List<Long> values) {
-            addCriterion("ORIGIN_COUNTRY_ID not in", values, "originCountryId");
+        public Criteria andDestinationCountryCodeNotIn(List<String> values) {
+            addCriterion("DESTINATION_COUNTRY_CODE not in", values, "destinationCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIdBetween(Long value1, Long value2) {
-            addCriterion("ORIGIN_COUNTRY_ID between", value1, value2, "originCountryId");
+        public Criteria andDestinationCountryCodeBetween(String value1, String value2) {
+            addCriterion("DESTINATION_COUNTRY_CODE between", value1, value2, "destinationCountryCode");
             return (Criteria) this;
         }
 
-        public Criteria andOriginCountryIdNotBetween(Long value1, Long value2) {
-            addCriterion("ORIGIN_COUNTRY_ID not between", value1, value2, "originCountryId");
+        public Criteria andDestinationCountryCodeNotBetween(String value1, String value2) {
+            addCriterion("DESTINATION_COUNTRY_CODE not between", value1, value2, "destinationCountryCode");
             return (Criteria) this;
         }
     }

@@ -39,9 +39,9 @@ public class Email implements Serializable {
     private String subject;
 
     /**
-     * 邮件类型ID,关联数据字典表。指定字典目录CODE：EMAIL_TYPE
+     * 邮件类型CODE,关联数据字典表。指定字典目录CODE：EMAIL_TYPE
      */
-    private Long typeId;
+    private String typeCode;
 
     /**
      * 邮件类型名称
@@ -49,9 +49,9 @@ public class Email implements Serializable {
     private String typeName;
 
     /**
-     * 邮件状态ID,关联数据字典表。指定字典目录CODE：EMAIL_STATUS
+     * 邮件状态CODE,关联数据字典表。指定字典目录CODE：EMAIL_STATUS
      */
-    private Long statusId;
+    private String statusCode;
 
     /**
      * 邮件状态名称
@@ -153,12 +153,12 @@ public class Email implements Serializable {
         this.subject = subject == null ? null : subject.trim();
     }
 
-    public Long getTypeId() {
-        return typeId;
+    public String getTypeCode() {
+        return typeCode;
     }
 
-    public void setTypeId(Long typeId) {
-        this.typeId = typeId;
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode == null ? null : typeCode.trim();
     }
 
     public String getTypeName() {
@@ -169,12 +169,12 @@ public class Email implements Serializable {
         this.typeName = typeName == null ? null : typeName.trim();
     }
 
-    public Long getStatusId() {
-        return statusId;
+    public String getStatusCode() {
+        return statusCode;
     }
 
-    public void setStatusId(Long statusId) {
-        this.statusId = statusId;
+    public void setStatusCode(String statusCode) {
+        this.statusCode = statusCode == null ? null : statusCode.trim();
     }
 
     public String getStatusName() {
@@ -269,9 +269,9 @@ public class Email implements Serializable {
         sb.append(", toAddress=").append(toAddress);
         sb.append(", ccAddress=").append(ccAddress);
         sb.append(", subject=").append(subject);
-        sb.append(", typeId=").append(typeId);
+        sb.append(", typeCode=").append(typeCode);
         sb.append(", typeName=").append(typeName);
-        sb.append(", statusId=").append(statusId);
+        sb.append(", statusCode=").append(statusCode);
         sb.append(", statusName=").append(statusName);
         sb.append(", sendNum=").append(sendNum);
         sb.append(", sendTime=").append(sendTime);

@@ -525,63 +525,73 @@ public class EmailExample {
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIsNull() {
-            addCriterion("TYPE_ID is null");
+        public Criteria andTypeCodeIsNull() {
+            addCriterion("TYPE_CODE is null");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIsNotNull() {
-            addCriterion("TYPE_ID is not null");
+        public Criteria andTypeCodeIsNotNull() {
+            addCriterion("TYPE_CODE is not null");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdEqualTo(Long value) {
-            addCriterion("TYPE_ID =", value, "typeId");
+        public Criteria andTypeCodeEqualTo(String value) {
+            addCriterion("TYPE_CODE =", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotEqualTo(Long value) {
-            addCriterion("TYPE_ID <>", value, "typeId");
+        public Criteria andTypeCodeNotEqualTo(String value) {
+            addCriterion("TYPE_CODE <>", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdGreaterThan(Long value) {
-            addCriterion("TYPE_ID >", value, "typeId");
+        public Criteria andTypeCodeGreaterThan(String value) {
+            addCriterion("TYPE_CODE >", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("TYPE_ID >=", value, "typeId");
+        public Criteria andTypeCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("TYPE_CODE >=", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdLessThan(Long value) {
-            addCriterion("TYPE_ID <", value, "typeId");
+        public Criteria andTypeCodeLessThan(String value) {
+            addCriterion("TYPE_CODE <", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdLessThanOrEqualTo(Long value) {
-            addCriterion("TYPE_ID <=", value, "typeId");
+        public Criteria andTypeCodeLessThanOrEqualTo(String value) {
+            addCriterion("TYPE_CODE <=", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIn(List<Long> values) {
-            addCriterion("TYPE_ID in", values, "typeId");
+        public Criteria andTypeCodeLike(String value) {
+            addCriterion("TYPE_CODE like", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotIn(List<Long> values) {
-            addCriterion("TYPE_ID not in", values, "typeId");
+        public Criteria andTypeCodeNotLike(String value) {
+            addCriterion("TYPE_CODE not like", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdBetween(Long value1, Long value2) {
-            addCriterion("TYPE_ID between", value1, value2, "typeId");
+        public Criteria andTypeCodeIn(List<String> values) {
+            addCriterion("TYPE_CODE in", values, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotBetween(Long value1, Long value2) {
-            addCriterion("TYPE_ID not between", value1, value2, "typeId");
+        public Criteria andTypeCodeNotIn(List<String> values) {
+            addCriterion("TYPE_CODE not in", values, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeBetween(String value1, String value2) {
+            addCriterion("TYPE_CODE between", value1, value2, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeNotBetween(String value1, String value2) {
+            addCriterion("TYPE_CODE not between", value1, value2, "typeCode");
             return (Criteria) this;
         }
 
@@ -655,63 +665,73 @@ public class EmailExample {
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIsNull() {
-            addCriterion("STATUS_ID is null");
+        public Criteria andStatusCodeIsNull() {
+            addCriterion("STATUS_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusCodeIsNotNull() {
+            addCriterion("STATUS_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusCodeEqualTo(String value) {
+            addCriterion("STATUS_CODE =", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIsNotNull() {
-            addCriterion("STATUS_ID is not null");
+        public Criteria andStatusCodeNotEqualTo(String value) {
+            addCriterion("STATUS_CODE <>", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdEqualTo(Long value) {
-            addCriterion("STATUS_ID =", value, "statusId");
+        public Criteria andStatusCodeGreaterThan(String value) {
+            addCriterion("STATUS_CODE >", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotEqualTo(Long value) {
-            addCriterion("STATUS_ID <>", value, "statusId");
+        public Criteria andStatusCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("STATUS_CODE >=", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdGreaterThan(Long value) {
-            addCriterion("STATUS_ID >", value, "statusId");
+        public Criteria andStatusCodeLessThan(String value) {
+            addCriterion("STATUS_CODE <", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("STATUS_ID >=", value, "statusId");
+        public Criteria andStatusCodeLessThanOrEqualTo(String value) {
+            addCriterion("STATUS_CODE <=", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdLessThan(Long value) {
-            addCriterion("STATUS_ID <", value, "statusId");
+        public Criteria andStatusCodeLike(String value) {
+            addCriterion("STATUS_CODE like", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdLessThanOrEqualTo(Long value) {
-            addCriterion("STATUS_ID <=", value, "statusId");
+        public Criteria andStatusCodeNotLike(String value) {
+            addCriterion("STATUS_CODE not like", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIn(List<Long> values) {
-            addCriterion("STATUS_ID in", values, "statusId");
+        public Criteria andStatusCodeIn(List<String> values) {
+            addCriterion("STATUS_CODE in", values, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotIn(List<Long> values) {
-            addCriterion("STATUS_ID not in", values, "statusId");
+        public Criteria andStatusCodeNotIn(List<String> values) {
+            addCriterion("STATUS_CODE not in", values, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdBetween(Long value1, Long value2) {
-            addCriterion("STATUS_ID between", value1, value2, "statusId");
+        public Criteria andStatusCodeBetween(String value1, String value2) {
+            addCriterion("STATUS_CODE between", value1, value2, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotBetween(Long value1, Long value2) {
-            addCriterion("STATUS_ID not between", value1, value2, "statusId");
+        public Criteria andStatusCodeNotBetween(String value1, String value2) {
+            addCriterion("STATUS_CODE not between", value1, value2, "statusCode");
             return (Criteria) this;
         }
 

@@ -29,10 +29,10 @@ public class PushOb implements Serializable {
     private Date pushTime;
 
     /**
-     * 推送状态ID。
+     * 推送状态CODE。
 关联数据字典表。指定字典目录CODE：PUSH_OB_STATUS
      */
-    private Long statusId;
+    private String statusCode;
 
     /**
      * 推送状态名称（待推送、推送成功、推送失败）
@@ -128,12 +128,12 @@ public class PushOb implements Serializable {
         this.pushTime = pushTime;
     }
 
-    public Long getStatusId() {
-        return statusId;
+    public String getStatusCode() {
+        return statusCode;
     }
 
-    public void setStatusId(Long statusId) {
-        this.statusId = statusId;
+    public void setStatusCode(String statusCode) {
+        this.statusCode = statusCode == null ? null : statusCode.trim();
     }
 
     public String getStatusName() {
@@ -242,7 +242,7 @@ public class PushOb implements Serializable {
         sb.append(", consignmentCode=").append(consignmentCode);
         sb.append(", consignmentId=").append(consignmentId);
         sb.append(", pushTime=").append(pushTime);
-        sb.append(", statusId=").append(statusId);
+        sb.append(", statusCode=").append(statusCode);
         sb.append(", statusName=").append(statusName);
         sb.append(", pushNum=").append(pushNum);
         sb.append(", filePath=").append(filePath);

@@ -24,10 +24,10 @@ public class PushObDetail implements Serializable {
     private Long consignmentId;
 
     /**
-     * 推送状态ID。
+     * 推送状态CODE。
 关联数据字典表。指定字典目录CODE：PUSH_OB_STATUS
      */
-    private Long statusId;
+    private String statusCode;
 
     /**
      * 推送状态名称（待推送、推送成功、推送失败）
@@ -35,9 +35,9 @@ public class PushObDetail implements Serializable {
     private String statusName;
 
     /**
-     * 推送文件类型字典ID，关联数据字典表。指定字典目录CODE：PUSH_OB_FILE_TYPE
+     * 推送文件类型字典CODE，关联数据字典表。指定字典目录CODE：PUSH_OB_FILE_TYPE
      */
-    private Long fileTypeId;
+    private String fileTypeCode;
 
     /**
      * 推送文件类型名称（XXX、XXX）
@@ -120,12 +120,12 @@ public class PushObDetail implements Serializable {
         this.consignmentId = consignmentId;
     }
 
-    public Long getStatusId() {
-        return statusId;
+    public String getStatusCode() {
+        return statusCode;
     }
 
-    public void setStatusId(Long statusId) {
-        this.statusId = statusId;
+    public void setStatusCode(String statusCode) {
+        this.statusCode = statusCode == null ? null : statusCode.trim();
     }
 
     public String getStatusName() {
@@ -136,12 +136,12 @@ public class PushObDetail implements Serializable {
         this.statusName = statusName == null ? null : statusName.trim();
     }
 
-    public Long getFileTypeId() {
-        return fileTypeId;
+    public String getFileTypeCode() {
+        return fileTypeCode;
     }
 
-    public void setFileTypeId(Long fileTypeId) {
-        this.fileTypeId = fileTypeId;
+    public void setFileTypeCode(String fileTypeCode) {
+        this.fileTypeCode = fileTypeCode == null ? null : fileTypeCode.trim();
     }
 
     public String getFileType() {
@@ -241,9 +241,9 @@ public class PushObDetail implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", consignmentCode=").append(consignmentCode);
         sb.append(", consignmentId=").append(consignmentId);
-        sb.append(", statusId=").append(statusId);
+        sb.append(", statusCode=").append(statusCode);
         sb.append(", statusName=").append(statusName);
-        sb.append(", fileTypeId=").append(fileTypeId);
+        sb.append(", fileTypeCode=").append(fileTypeCode);
         sb.append(", fileType=").append(fileType);
         sb.append(", fileName=").append(fileName);
         sb.append(", pushObId=").append(pushObId);

@@ -315,63 +315,73 @@ public class PushObDetailExample {
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIsNull() {
-            addCriterion("STATUS_ID is null");
+        public Criteria andStatusCodeIsNull() {
+            addCriterion("STATUS_CODE is null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIsNotNull() {
-            addCriterion("STATUS_ID is not null");
+        public Criteria andStatusCodeIsNotNull() {
+            addCriterion("STATUS_CODE is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdEqualTo(Long value) {
-            addCriterion("STATUS_ID =", value, "statusId");
+        public Criteria andStatusCodeEqualTo(String value) {
+            addCriterion("STATUS_CODE =", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotEqualTo(Long value) {
-            addCriterion("STATUS_ID <>", value, "statusId");
+        public Criteria andStatusCodeNotEqualTo(String value) {
+            addCriterion("STATUS_CODE <>", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdGreaterThan(Long value) {
-            addCriterion("STATUS_ID >", value, "statusId");
+        public Criteria andStatusCodeGreaterThan(String value) {
+            addCriterion("STATUS_CODE >", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("STATUS_ID >=", value, "statusId");
+        public Criteria andStatusCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("STATUS_CODE >=", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdLessThan(Long value) {
-            addCriterion("STATUS_ID <", value, "statusId");
+        public Criteria andStatusCodeLessThan(String value) {
+            addCriterion("STATUS_CODE <", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdLessThanOrEqualTo(Long value) {
-            addCriterion("STATUS_ID <=", value, "statusId");
+        public Criteria andStatusCodeLessThanOrEqualTo(String value) {
+            addCriterion("STATUS_CODE <=", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIn(List<Long> values) {
-            addCriterion("STATUS_ID in", values, "statusId");
+        public Criteria andStatusCodeLike(String value) {
+            addCriterion("STATUS_CODE like", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotIn(List<Long> values) {
-            addCriterion("STATUS_ID not in", values, "statusId");
+        public Criteria andStatusCodeNotLike(String value) {
+            addCriterion("STATUS_CODE not like", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdBetween(Long value1, Long value2) {
-            addCriterion("STATUS_ID between", value1, value2, "statusId");
+        public Criteria andStatusCodeIn(List<String> values) {
+            addCriterion("STATUS_CODE in", values, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotBetween(Long value1, Long value2) {
-            addCriterion("STATUS_ID not between", value1, value2, "statusId");
+        public Criteria andStatusCodeNotIn(List<String> values) {
+            addCriterion("STATUS_CODE not in", values, "statusCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusCodeBetween(String value1, String value2) {
+            addCriterion("STATUS_CODE between", value1, value2, "statusCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusCodeNotBetween(String value1, String value2) {
+            addCriterion("STATUS_CODE not between", value1, value2, "statusCode");
             return (Criteria) this;
         }
 
@@ -445,63 +455,73 @@ public class PushObDetailExample {
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdIsNull() {
-            addCriterion("FILE_TYPE_ID is null");
+        public Criteria andFileTypeCodeIsNull() {
+            addCriterion("FILE_TYPE_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeCodeIsNotNull() {
+            addCriterion("FILE_TYPE_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeCodeEqualTo(String value) {
+            addCriterion("FILE_TYPE_CODE =", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdIsNotNull() {
-            addCriterion("FILE_TYPE_ID is not null");
+        public Criteria andFileTypeCodeNotEqualTo(String value) {
+            addCriterion("FILE_TYPE_CODE <>", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdEqualTo(Long value) {
-            addCriterion("FILE_TYPE_ID =", value, "fileTypeId");
+        public Criteria andFileTypeCodeGreaterThan(String value) {
+            addCriterion("FILE_TYPE_CODE >", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdNotEqualTo(Long value) {
-            addCriterion("FILE_TYPE_ID <>", value, "fileTypeId");
+        public Criteria andFileTypeCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("FILE_TYPE_CODE >=", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdGreaterThan(Long value) {
-            addCriterion("FILE_TYPE_ID >", value, "fileTypeId");
+        public Criteria andFileTypeCodeLessThan(String value) {
+            addCriterion("FILE_TYPE_CODE <", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("FILE_TYPE_ID >=", value, "fileTypeId");
+        public Criteria andFileTypeCodeLessThanOrEqualTo(String value) {
+            addCriterion("FILE_TYPE_CODE <=", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdLessThan(Long value) {
-            addCriterion("FILE_TYPE_ID <", value, "fileTypeId");
+        public Criteria andFileTypeCodeLike(String value) {
+            addCriterion("FILE_TYPE_CODE like", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdLessThanOrEqualTo(Long value) {
-            addCriterion("FILE_TYPE_ID <=", value, "fileTypeId");
+        public Criteria andFileTypeCodeNotLike(String value) {
+            addCriterion("FILE_TYPE_CODE not like", value, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdIn(List<Long> values) {
-            addCriterion("FILE_TYPE_ID in", values, "fileTypeId");
+        public Criteria andFileTypeCodeIn(List<String> values) {
+            addCriterion("FILE_TYPE_CODE in", values, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdNotIn(List<Long> values) {
-            addCriterion("FILE_TYPE_ID not in", values, "fileTypeId");
+        public Criteria andFileTypeCodeNotIn(List<String> values) {
+            addCriterion("FILE_TYPE_CODE not in", values, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdBetween(Long value1, Long value2) {
-            addCriterion("FILE_TYPE_ID between", value1, value2, "fileTypeId");
+        public Criteria andFileTypeCodeBetween(String value1, String value2) {
+            addCriterion("FILE_TYPE_CODE between", value1, value2, "fileTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andFileTypeIdNotBetween(Long value1, Long value2) {
-            addCriterion("FILE_TYPE_ID not between", value1, value2, "fileTypeId");
+        public Criteria andFileTypeCodeNotBetween(String value1, String value2) {
+            addCriterion("FILE_TYPE_CODE not between", value1, value2, "fileTypeCode");
             return (Criteria) this;
         }
 

@@ -375,63 +375,73 @@ public class PushObExample {
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIsNull() {
-            addCriterion("STATUS_ID is null");
+        public Criteria andStatusCodeIsNull() {
+            addCriterion("STATUS_CODE is null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIsNotNull() {
-            addCriterion("STATUS_ID is not null");
+        public Criteria andStatusCodeIsNotNull() {
+            addCriterion("STATUS_CODE is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdEqualTo(Long value) {
-            addCriterion("STATUS_ID =", value, "statusId");
+        public Criteria andStatusCodeEqualTo(String value) {
+            addCriterion("STATUS_CODE =", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotEqualTo(Long value) {
-            addCriterion("STATUS_ID <>", value, "statusId");
+        public Criteria andStatusCodeNotEqualTo(String value) {
+            addCriterion("STATUS_CODE <>", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdGreaterThan(Long value) {
-            addCriterion("STATUS_ID >", value, "statusId");
+        public Criteria andStatusCodeGreaterThan(String value) {
+            addCriterion("STATUS_CODE >", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("STATUS_ID >=", value, "statusId");
+        public Criteria andStatusCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("STATUS_CODE >=", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdLessThan(Long value) {
-            addCriterion("STATUS_ID <", value, "statusId");
+        public Criteria andStatusCodeLessThan(String value) {
+            addCriterion("STATUS_CODE <", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdLessThanOrEqualTo(Long value) {
-            addCriterion("STATUS_ID <=", value, "statusId");
+        public Criteria andStatusCodeLessThanOrEqualTo(String value) {
+            addCriterion("STATUS_CODE <=", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIn(List<Long> values) {
-            addCriterion("STATUS_ID in", values, "statusId");
+        public Criteria andStatusCodeLike(String value) {
+            addCriterion("STATUS_CODE like", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotIn(List<Long> values) {
-            addCriterion("STATUS_ID not in", values, "statusId");
+        public Criteria andStatusCodeNotLike(String value) {
+            addCriterion("STATUS_CODE not like", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdBetween(Long value1, Long value2) {
-            addCriterion("STATUS_ID between", value1, value2, "statusId");
+        public Criteria andStatusCodeIn(List<String> values) {
+            addCriterion("STATUS_CODE in", values, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotBetween(Long value1, Long value2) {
-            addCriterion("STATUS_ID not between", value1, value2, "statusId");
+        public Criteria andStatusCodeNotIn(List<String> values) {
+            addCriterion("STATUS_CODE not in", values, "statusCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusCodeBetween(String value1, String value2) {
+            addCriterion("STATUS_CODE between", value1, value2, "statusCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusCodeNotBetween(String value1, String value2) {
+            addCriterion("STATUS_CODE not between", value1, value2, "statusCode");
             return (Criteria) this;
         }
 

@@ -19,14 +19,15 @@ public class UploadRecord implements Serializable {
     private Long consignmentId;
 
     /**
-     * 上传状态(uploaded)
+     * 运单状态CODE，
+关联数据字典表。指定字典目录CODE：CONSIGNMENT_STATUS
      */
-    private String uploadStatus;
+    private String statusCode;
 
     /**
-     * 状态(0：无效、1：有效)
+     * 运单状态名称(上传成功、上传失败)
      */
-    private Long status;
+    private String statusName;
 
     /**
      * 创建时间
@@ -58,6 +59,11 @@ public class UploadRecord implements Serializable {
      */
     private String modifyUserName;
 
+    /**
+     * 运单号
+     */
+    private String consignmentCode;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -76,20 +82,20 @@ public class UploadRecord implements Serializable {
         this.consignmentId = consignmentId;
     }
 
-    public String getUploadStatus() {
-        return uploadStatus;
+    public String getStatusCode() {
+        return statusCode;
     }
 
-    public void setUploadStatus(String uploadStatus) {
-        this.uploadStatus = uploadStatus == null ? null : uploadStatus.trim();
+    public void setStatusCode(String statusCode) {
+        this.statusCode = statusCode == null ? null : statusCode.trim();
     }
 
-    public Long getStatus() {
-        return status;
+    public String getStatusName() {
+        return statusName;
     }
 
-    public void setStatus(Long status) {
-        this.status = status;
+    public void setStatusName(String statusName) {
+        this.statusName = statusName == null ? null : statusName.trim();
     }
 
     public Date getCreateTime() {
@@ -140,6 +146,14 @@ public class UploadRecord implements Serializable {
         this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
     }
 
+    public String getConsignmentCode() {
+        return consignmentCode;
+    }
+
+    public void setConsignmentCode(String consignmentCode) {
+        this.consignmentCode = consignmentCode == null ? null : consignmentCode.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -148,14 +162,15 @@ public class UploadRecord implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", consignmentId=").append(consignmentId);
-        sb.append(", uploadStatus=").append(uploadStatus);
-        sb.append(", status=").append(status);
+        sb.append(", statusCode=").append(statusCode);
+        sb.append(", statusName=").append(statusName);
         sb.append(", createTime=").append(createTime);
         sb.append(", createUserId=").append(createUserId);
         sb.append(", createUserName=").append(createUserName);
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", modifyUserId=").append(modifyUserId);
         sb.append(", modifyUserName=").append(modifyUserName);
+        sb.append(", consignmentCode=").append(consignmentCode);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

@@ -245,133 +245,143 @@ public class UploadRecordExample {
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusIsNull() {
-            addCriterion("UPLOAD_STATUS is null");
+        public Criteria andStatusCodeIsNull() {
+            addCriterion("STATUS_CODE is null");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusIsNotNull() {
-            addCriterion("UPLOAD_STATUS is not null");
+        public Criteria andStatusCodeIsNotNull() {
+            addCriterion("STATUS_CODE is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusEqualTo(String value) {
-            addCriterion("UPLOAD_STATUS =", value, "uploadStatus");
+        public Criteria andStatusCodeEqualTo(String value) {
+            addCriterion("STATUS_CODE =", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusNotEqualTo(String value) {
-            addCriterion("UPLOAD_STATUS <>", value, "uploadStatus");
+        public Criteria andStatusCodeNotEqualTo(String value) {
+            addCriterion("STATUS_CODE <>", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusGreaterThan(String value) {
-            addCriterion("UPLOAD_STATUS >", value, "uploadStatus");
+        public Criteria andStatusCodeGreaterThan(String value) {
+            addCriterion("STATUS_CODE >", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusGreaterThanOrEqualTo(String value) {
-            addCriterion("UPLOAD_STATUS >=", value, "uploadStatus");
+        public Criteria andStatusCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("STATUS_CODE >=", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusLessThan(String value) {
-            addCriterion("UPLOAD_STATUS <", value, "uploadStatus");
+        public Criteria andStatusCodeLessThan(String value) {
+            addCriterion("STATUS_CODE <", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusLessThanOrEqualTo(String value) {
-            addCriterion("UPLOAD_STATUS <=", value, "uploadStatus");
+        public Criteria andStatusCodeLessThanOrEqualTo(String value) {
+            addCriterion("STATUS_CODE <=", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusLike(String value) {
-            addCriterion("UPLOAD_STATUS like", value, "uploadStatus");
+        public Criteria andStatusCodeLike(String value) {
+            addCriterion("STATUS_CODE like", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusNotLike(String value) {
-            addCriterion("UPLOAD_STATUS not like", value, "uploadStatus");
+        public Criteria andStatusCodeNotLike(String value) {
+            addCriterion("STATUS_CODE not like", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusIn(List<String> values) {
-            addCriterion("UPLOAD_STATUS in", values, "uploadStatus");
+        public Criteria andStatusCodeIn(List<String> values) {
+            addCriterion("STATUS_CODE in", values, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusNotIn(List<String> values) {
-            addCriterion("UPLOAD_STATUS not in", values, "uploadStatus");
+        public Criteria andStatusCodeNotIn(List<String> values) {
+            addCriterion("STATUS_CODE not in", values, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusBetween(String value1, String value2) {
-            addCriterion("UPLOAD_STATUS between", value1, value2, "uploadStatus");
+        public Criteria andStatusCodeBetween(String value1, String value2) {
+            addCriterion("STATUS_CODE between", value1, value2, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andUploadStatusNotBetween(String value1, String value2) {
-            addCriterion("UPLOAD_STATUS not between", value1, value2, "uploadStatus");
+        public Criteria andStatusCodeNotBetween(String value1, String value2) {
+            addCriterion("STATUS_CODE not between", value1, value2, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNull() {
-            addCriterion("STATUS is null");
+        public Criteria andStatusNameIsNull() {
+            addCriterion("STATUS_NAME is null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNotNull() {
-            addCriterion("STATUS is not null");
+        public Criteria andStatusNameIsNotNull() {
+            addCriterion("STATUS_NAME is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusEqualTo(Long value) {
-            addCriterion("STATUS =", value, "status");
+        public Criteria andStatusNameEqualTo(String value) {
+            addCriterion("STATUS_NAME =", value, "statusName");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotEqualTo(Long value) {
-            addCriterion("STATUS <>", value, "status");
+        public Criteria andStatusNameNotEqualTo(String value) {
+            addCriterion("STATUS_NAME <>", value, "statusName");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThan(Long value) {
-            addCriterion("STATUS >", value, "status");
+        public Criteria andStatusNameGreaterThan(String value) {
+            addCriterion("STATUS_NAME >", value, "statusName");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThanOrEqualTo(Long value) {
-            addCriterion("STATUS >=", value, "status");
+        public Criteria andStatusNameGreaterThanOrEqualTo(String value) {
+            addCriterion("STATUS_NAME >=", value, "statusName");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThan(Long value) {
-            addCriterion("STATUS <", value, "status");
+        public Criteria andStatusNameLessThan(String value) {
+            addCriterion("STATUS_NAME <", value, "statusName");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThanOrEqualTo(Long value) {
-            addCriterion("STATUS <=", value, "status");
+        public Criteria andStatusNameLessThanOrEqualTo(String value) {
+            addCriterion("STATUS_NAME <=", value, "statusName");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIn(List<Long> values) {
-            addCriterion("STATUS in", values, "status");
+        public Criteria andStatusNameLike(String value) {
+            addCriterion("STATUS_NAME like", value, "statusName");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotIn(List<Long> values) {
-            addCriterion("STATUS not in", values, "status");
+        public Criteria andStatusNameNotLike(String value) {
+            addCriterion("STATUS_NAME not like", value, "statusName");
             return (Criteria) this;
         }
 
-        public Criteria andStatusBetween(Long value1, Long value2) {
-            addCriterion("STATUS between", value1, value2, "status");
+        public Criteria andStatusNameIn(List<String> values) {
+            addCriterion("STATUS_NAME in", values, "statusName");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotBetween(Long value1, Long value2) {
-            addCriterion("STATUS not between", value1, value2, "status");
+        public Criteria andStatusNameNotIn(List<String> values) {
+            addCriterion("STATUS_NAME not in", values, "statusName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNameBetween(String value1, String value2) {
+            addCriterion("STATUS_NAME between", value1, value2, "statusName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNameNotBetween(String value1, String value2) {
+            addCriterion("STATUS_NAME not between", value1, value2, "statusName");
             return (Criteria) this;
         }
 
@@ -754,6 +764,76 @@ public class UploadRecordExample {
             addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName");
             return (Criteria) this;
         }
+
+        public Criteria andConsignmentCodeIsNull() {
+            addCriterion("CONSIGNMENT_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeIsNotNull() {
+            addCriterion("CONSIGNMENT_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeEqualTo(String value) {
+            addCriterion("CONSIGNMENT_CODE =", value, "consignmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeNotEqualTo(String value) {
+            addCriterion("CONSIGNMENT_CODE <>", value, "consignmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeGreaterThan(String value) {
+            addCriterion("CONSIGNMENT_CODE >", value, "consignmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("CONSIGNMENT_CODE >=", value, "consignmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeLessThan(String value) {
+            addCriterion("CONSIGNMENT_CODE <", value, "consignmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeLessThanOrEqualTo(String value) {
+            addCriterion("CONSIGNMENT_CODE <=", value, "consignmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeLike(String value) {
+            addCriterion("CONSIGNMENT_CODE like", value, "consignmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeNotLike(String value) {
+            addCriterion("CONSIGNMENT_CODE not like", value, "consignmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeIn(List<String> values) {
+            addCriterion("CONSIGNMENT_CODE in", values, "consignmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeNotIn(List<String> values) {
+            addCriterion("CONSIGNMENT_CODE not in", values, "consignmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeBetween(String value1, String value2) {
+            addCriterion("CONSIGNMENT_CODE between", value1, value2, "consignmentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentCodeNotBetween(String value1, String value2) {
+            addCriterion("CONSIGNMENT_CODE not between", value1, value2, "consignmentCode");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

@@ -39,9 +39,9 @@ public class EmailHistory implements Serializable {
     private String subject;
 
     /**
-     * 邮件类型ID,关联数据字典表。指定字典目录CODE：EMAIL_TYPE
+     * 邮件类型CODE,关联数据字典表。指定字典目录CODE：EMAIL_TYPE
      */
-    private Long typeId;
+    private String typeCode;
 
     /**
      * 邮件类型名称
@@ -49,9 +49,9 @@ public class EmailHistory implements Serializable {
     private String typeName;
 
     /**
-     * 邮件状态ID,关联数据字典表。指定字典目录CODE：EMAIL_STATUS
+     * 邮件状态CODE,关联数据字典表。指定字典目录CODE：EMAIL_STATUS
      */
-    private Long statusId;
+    private String statusCode;
 
     /**
      * 邮件状态名称
@@ -153,12 +153,12 @@ public class EmailHistory implements Serializable {
         this.subject = subject == null ? null : subject.trim();
     }
 
-    public Long getTypeId() {
-        return typeId;
+    public String getTypeCode() {
+        return typeCode;
     }
 
-    public void setTypeId(Long typeId) {
-        this.typeId = typeId;
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode == null ? null : typeCode.trim();
     }
 
     public String getTypeName() {
@@ -169,12 +169,12 @@ public class EmailHistory implements Serializable {
         this.typeName = typeName == null ? null : typeName.trim();
     }
 
-    public Long getStatusId() {
-        return statusId;
+    public String getStatusCode() {
+        return statusCode;
     }
 
-    public void setStatusId(Long statusId) {
-        this.statusId = statusId;
+    public void setStatusCode(String statusCode) {
+        this.statusCode = statusCode == null ? null : statusCode.trim();
     }
 
     public String getStatusName() {
@@ -269,9 +269,9 @@ public class EmailHistory implements Serializable {
         sb.append(", toAddress=").append(toAddress);
         sb.append(", ccAddress=").append(ccAddress);
         sb.append(", subject=").append(subject);
-        sb.append(", typeId=").append(typeId);
+        sb.append(", typeCode=").append(typeCode);
         sb.append(", typeName=").append(typeName);
-        sb.append(", statusId=").append(statusId);
+        sb.append(", statusCode=").append(statusCode);
         sb.append(", statusName=").append(statusName);
         sb.append(", sendNum=").append(sendNum);
         sb.append(", sendTime=").append(sendTime);

@@ -525,63 +525,73 @@ public class EmailHistoryExample {
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIsNull() {
-            addCriterion("TYPE_ID is null");
+        public Criteria andTypeCodeIsNull() {
+            addCriterion("TYPE_CODE is null");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIsNotNull() {
-            addCriterion("TYPE_ID is not null");
+        public Criteria andTypeCodeIsNotNull() {
+            addCriterion("TYPE_CODE is not null");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdEqualTo(Long value) {
-            addCriterion("TYPE_ID =", value, "typeId");
+        public Criteria andTypeCodeEqualTo(String value) {
+            addCriterion("TYPE_CODE =", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotEqualTo(Long value) {
-            addCriterion("TYPE_ID <>", value, "typeId");
+        public Criteria andTypeCodeNotEqualTo(String value) {
+            addCriterion("TYPE_CODE <>", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdGreaterThan(Long value) {
-            addCriterion("TYPE_ID >", value, "typeId");
+        public Criteria andTypeCodeGreaterThan(String value) {
+            addCriterion("TYPE_CODE >", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("TYPE_ID >=", value, "typeId");
+        public Criteria andTypeCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("TYPE_CODE >=", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdLessThan(Long value) {
-            addCriterion("TYPE_ID <", value, "typeId");
+        public Criteria andTypeCodeLessThan(String value) {
+            addCriterion("TYPE_CODE <", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdLessThanOrEqualTo(Long value) {
-            addCriterion("TYPE_ID <=", value, "typeId");
+        public Criteria andTypeCodeLessThanOrEqualTo(String value) {
+            addCriterion("TYPE_CODE <=", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIn(List<Long> values) {
-            addCriterion("TYPE_ID in", values, "typeId");
+        public Criteria andTypeCodeLike(String value) {
+            addCriterion("TYPE_CODE like", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotIn(List<Long> values) {
-            addCriterion("TYPE_ID not in", values, "typeId");
+        public Criteria andTypeCodeNotLike(String value) {
+            addCriterion("TYPE_CODE not like", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdBetween(Long value1, Long value2) {
-            addCriterion("TYPE_ID between", value1, value2, "typeId");
+        public Criteria andTypeCodeIn(List<String> values) {
+            addCriterion("TYPE_CODE in", values, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotBetween(Long value1, Long value2) {
-            addCriterion("TYPE_ID not between", value1, value2, "typeId");
+        public Criteria andTypeCodeNotIn(List<String> values) {
+            addCriterion("TYPE_CODE not in", values, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeBetween(String value1, String value2) {
+            addCriterion("TYPE_CODE between", value1, value2, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeNotBetween(String value1, String value2) {
+            addCriterion("TYPE_CODE not between", value1, value2, "typeCode");
             return (Criteria) this;
         }
 
@@ -655,63 +665,73 @@ public class EmailHistoryExample {
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIsNull() {
-            addCriterion("STATUS_ID is null");
+        public Criteria andStatusCodeIsNull() {
+            addCriterion("STATUS_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusCodeIsNotNull() {
+            addCriterion("STATUS_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusCodeEqualTo(String value) {
+            addCriterion("STATUS_CODE =", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIsNotNull() {
-            addCriterion("STATUS_ID is not null");
+        public Criteria andStatusCodeNotEqualTo(String value) {
+            addCriterion("STATUS_CODE <>", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdEqualTo(Long value) {
-            addCriterion("STATUS_ID =", value, "statusId");
+        public Criteria andStatusCodeGreaterThan(String value) {
+            addCriterion("STATUS_CODE >", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotEqualTo(Long value) {
-            addCriterion("STATUS_ID <>", value, "statusId");
+        public Criteria andStatusCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("STATUS_CODE >=", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdGreaterThan(Long value) {
-            addCriterion("STATUS_ID >", value, "statusId");
+        public Criteria andStatusCodeLessThan(String value) {
+            addCriterion("STATUS_CODE <", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("STATUS_ID >=", value, "statusId");
+        public Criteria andStatusCodeLessThanOrEqualTo(String value) {
+            addCriterion("STATUS_CODE <=", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdLessThan(Long value) {
-            addCriterion("STATUS_ID <", value, "statusId");
+        public Criteria andStatusCodeLike(String value) {
+            addCriterion("STATUS_CODE like", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdLessThanOrEqualTo(Long value) {
-            addCriterion("STATUS_ID <=", value, "statusId");
+        public Criteria andStatusCodeNotLike(String value) {
+            addCriterion("STATUS_CODE not like", value, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdIn(List<Long> values) {
-            addCriterion("STATUS_ID in", values, "statusId");
+        public Criteria andStatusCodeIn(List<String> values) {
+            addCriterion("STATUS_CODE in", values, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotIn(List<Long> values) {
-            addCriterion("STATUS_ID not in", values, "statusId");
+        public Criteria andStatusCodeNotIn(List<String> values) {
+            addCriterion("STATUS_CODE not in", values, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdBetween(Long value1, Long value2) {
-            addCriterion("STATUS_ID between", value1, value2, "statusId");
+        public Criteria andStatusCodeBetween(String value1, String value2) {
+            addCriterion("STATUS_CODE between", value1, value2, "statusCode");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIdNotBetween(Long value1, Long value2) {
-            addCriterion("STATUS_ID not between", value1, value2, "statusId");
+        public Criteria andStatusCodeNotBetween(String value1, String value2) {
+            addCriterion("STATUS_CODE not between", value1, value2, "statusCode");
             return (Criteria) this;
         }
 

@@ -19,10 +19,10 @@ public class UserLoginInfo implements Serializable {
     private Long userId;
 
     /**
-     * 操作类型ID。
+     * 操作类型CODE。
 关联数据字典表。指定字典目录CODE：USER_LOGIN_TYPE
      */
-    private Long operTypeId;
+    private String operTypeCode;
 
     /**
      * 操作类型名称(登录、退出、修改密码、FCL登录注册,、停用、启用)
@@ -87,12 +87,12 @@ public class UserLoginInfo implements Serializable {
         this.userId = userId;
     }
 
-    public Long getOperTypeId() {
-        return operTypeId;
+    public String getOperTypeCode() {
+        return operTypeCode;
     }
 
-    public void setOperTypeId(Long operTypeId) {
-        this.operTypeId = operTypeId;
+    public void setOperTypeCode(String operTypeCode) {
+        this.operTypeCode = operTypeCode == null ? null : operTypeCode.trim();
     }
 
     public String getOperTypeName() {
@@ -175,7 +175,7 @@ public class UserLoginInfo implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", userId=").append(userId);
-        sb.append(", operTypeId=").append(operTypeId);
+        sb.append(", operTypeCode=").append(operTypeCode);
         sb.append(", operTypeName=").append(operTypeName);
         sb.append(", operDesc=").append(operDesc);
         sb.append(", ip=").append(ip);

@@ -245,63 +245,73 @@ public class UserLoginInfoExample {
             return (Criteria) this;
         }
 
-        public Criteria andOperTypeIdIsNull() {
-            addCriterion("OPER_TYPE_ID is null");
+        public Criteria andOperTypeCodeIsNull() {
+            addCriterion("OPER_TYPE_CODE is null");
             return (Criteria) this;
         }
 
-        public Criteria andOperTypeIdIsNotNull() {
-            addCriterion("OPER_TYPE_ID is not null");
+        public Criteria andOperTypeCodeIsNotNull() {
+            addCriterion("OPER_TYPE_CODE is not null");
             return (Criteria) this;
         }
 
-        public Criteria andOperTypeIdEqualTo(Long value) {
-            addCriterion("OPER_TYPE_ID =", value, "operTypeId");
+        public Criteria andOperTypeCodeEqualTo(String value) {
+            addCriterion("OPER_TYPE_CODE =", value, "operTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andOperTypeIdNotEqualTo(Long value) {
-            addCriterion("OPER_TYPE_ID <>", value, "operTypeId");
+        public Criteria andOperTypeCodeNotEqualTo(String value) {
+            addCriterion("OPER_TYPE_CODE <>", value, "operTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andOperTypeIdGreaterThan(Long value) {
-            addCriterion("OPER_TYPE_ID >", value, "operTypeId");
+        public Criteria andOperTypeCodeGreaterThan(String value) {
+            addCriterion("OPER_TYPE_CODE >", value, "operTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andOperTypeIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("OPER_TYPE_ID >=", value, "operTypeId");
+        public Criteria andOperTypeCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("OPER_TYPE_CODE >=", value, "operTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andOperTypeIdLessThan(Long value) {
-            addCriterion("OPER_TYPE_ID <", value, "operTypeId");
+        public Criteria andOperTypeCodeLessThan(String value) {
+            addCriterion("OPER_TYPE_CODE <", value, "operTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andOperTypeIdLessThanOrEqualTo(Long value) {
-            addCriterion("OPER_TYPE_ID <=", value, "operTypeId");
+        public Criteria andOperTypeCodeLessThanOrEqualTo(String value) {
+            addCriterion("OPER_TYPE_CODE <=", value, "operTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andOperTypeIdIn(List<Long> values) {
-            addCriterion("OPER_TYPE_ID in", values, "operTypeId");
+        public Criteria andOperTypeCodeLike(String value) {
+            addCriterion("OPER_TYPE_CODE like", value, "operTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andOperTypeIdNotIn(List<Long> values) {
-            addCriterion("OPER_TYPE_ID not in", values, "operTypeId");
+        public Criteria andOperTypeCodeNotLike(String value) {
+            addCriterion("OPER_TYPE_CODE not like", value, "operTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andOperTypeIdBetween(Long value1, Long value2) {
-            addCriterion("OPER_TYPE_ID between", value1, value2, "operTypeId");
+        public Criteria andOperTypeCodeIn(List<String> values) {
+            addCriterion("OPER_TYPE_CODE in", values, "operTypeCode");
             return (Criteria) this;
         }
 
-        public Criteria andOperTypeIdNotBetween(Long value1, Long value2) {
-            addCriterion("OPER_TYPE_ID not between", value1, value2, "operTypeId");
+        public Criteria andOperTypeCodeNotIn(List<String> values) {
+            addCriterion("OPER_TYPE_CODE not in", values, "operTypeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperTypeCodeBetween(String value1, String value2) {
+            addCriterion("OPER_TYPE_CODE between", value1, value2, "operTypeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperTypeCodeNotBetween(String value1, String value2) {
+            addCriterion("OPER_TYPE_CODE not between", value1, value2, "operTypeCode");
             return (Criteria) this;
         }
 

@@ -5,7 +5,7 @@ import java.util.Date;
 
 /**
  * DESC: KAFKA临时表
- * TABLE: T_SYS_KAFKA_TEMPORARY_STORAGE
+ * TABLE: ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
  */
 public class KafkaTemporaryStorage implements Serializable {
     /**
@@ -98,11 +98,6 @@ public class KafkaTemporaryStorage implements Serializable {
      */
     private String data;
 
-    /**
-     * 消息字符串
-     */
-    private String message;
-
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -249,14 +244,6 @@ public class KafkaTemporaryStorage implements Serializable {
         this.data = data == null ? null : data.trim();
     }
 
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();

@@ -29,9 +29,9 @@ public class ParamConfig implements Serializable {
     private String value;
 
     /**
-     * 参数类型ID，关联数据字典表。指定字典目录CODE：PARAM_CONFIG_TYPE
+     * 参数类型CODE，关联数据字典表。指定字典目录CODE：PARAM_CONFIG_TYPE
      */
-    private Long typeId;
+    private String typeCode;
 
     /**
      * 参数类型名称
@@ -112,12 +112,12 @@ public class ParamConfig implements Serializable {
         this.value = value == null ? null : value.trim();
     }
 
-    public Long getTypeId() {
-        return typeId;
+    public String getTypeCode() {
+        return typeCode;
     }
 
-    public void setTypeId(Long typeId) {
-        this.typeId = typeId;
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode == null ? null : typeCode.trim();
     }
 
     public String getTypeName() {
@@ -202,7 +202,7 @@ public class ParamConfig implements Serializable {
         sb.append(", code=").append(code);
         sb.append(", name=").append(name);
         sb.append(", value=").append(value);
-        sb.append(", typeId=").append(typeId);
+        sb.append(", typeCode=").append(typeCode);
         sb.append(", typeName=").append(typeName);
         sb.append(", status=").append(status);
         sb.append(", description=").append(description);

@@ -395,63 +395,73 @@ public class ParamConfigExample {
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIsNull() {
-            addCriterion("TYPE_ID is null");
+        public Criteria andTypeCodeIsNull() {
+            addCriterion("TYPE_CODE is null");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIsNotNull() {
-            addCriterion("TYPE_ID is not null");
+        public Criteria andTypeCodeIsNotNull() {
+            addCriterion("TYPE_CODE is not null");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdEqualTo(Long value) {
-            addCriterion("TYPE_ID =", value, "typeId");
+        public Criteria andTypeCodeEqualTo(String value) {
+            addCriterion("TYPE_CODE =", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotEqualTo(Long value) {
-            addCriterion("TYPE_ID <>", value, "typeId");
+        public Criteria andTypeCodeNotEqualTo(String value) {
+            addCriterion("TYPE_CODE <>", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdGreaterThan(Long value) {
-            addCriterion("TYPE_ID >", value, "typeId");
+        public Criteria andTypeCodeGreaterThan(String value) {
+            addCriterion("TYPE_CODE >", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("TYPE_ID >=", value, "typeId");
+        public Criteria andTypeCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("TYPE_CODE >=", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdLessThan(Long value) {
-            addCriterion("TYPE_ID <", value, "typeId");
+        public Criteria andTypeCodeLessThan(String value) {
+            addCriterion("TYPE_CODE <", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdLessThanOrEqualTo(Long value) {
-            addCriterion("TYPE_ID <=", value, "typeId");
+        public Criteria andTypeCodeLessThanOrEqualTo(String value) {
+            addCriterion("TYPE_CODE <=", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIn(List<Long> values) {
-            addCriterion("TYPE_ID in", values, "typeId");
+        public Criteria andTypeCodeLike(String value) {
+            addCriterion("TYPE_CODE like", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotIn(List<Long> values) {
-            addCriterion("TYPE_ID not in", values, "typeId");
+        public Criteria andTypeCodeNotLike(String value) {
+            addCriterion("TYPE_CODE not like", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdBetween(Long value1, Long value2) {
-            addCriterion("TYPE_ID between", value1, value2, "typeId");
+        public Criteria andTypeCodeIn(List<String> values) {
+            addCriterion("TYPE_CODE in", values, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotBetween(Long value1, Long value2) {
-            addCriterion("TYPE_ID not between", value1, value2, "typeId");
+        public Criteria andTypeCodeNotIn(List<String> values) {
+            addCriterion("TYPE_CODE not in", values, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeBetween(String value1, String value2) {
+            addCriterion("TYPE_CODE between", value1, value2, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeNotBetween(String value1, String value2) {
+            addCriterion("TYPE_CODE not between", value1, value2, "typeCode");
             return (Criteria) this;
         }
 

@@ -29,10 +29,10 @@ public class Role implements Serializable {
     private String roleDesc;
 
     /**
-     * 类型ID。
-关联数据字典表。指定KEY为：role_type
+     * 类型CODE。
+关联数据字典表。指定KEY为：ROLE_TYPE
      */
-    private Long typeId;
+    private String typeCode;
 
     /**
      * 用户类型名称
@@ -108,12 +108,12 @@ public class Role implements Serializable {
         this.roleDesc = roleDesc == null ? null : roleDesc.trim();
     }
 
-    public Long getTypeId() {
-        return typeId;
+    public String getTypeCode() {
+        return typeCode;
     }
 
-    public void setTypeId(Long typeId) {
-        this.typeId = typeId;
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode == null ? null : typeCode.trim();
     }
 
     public String getTypeName() {
@@ -190,7 +190,7 @@ public class Role implements Serializable {
         sb.append(", code=").append(code);
         sb.append(", name=").append(name);
         sb.append(", roleDesc=").append(roleDesc);
-        sb.append(", typeId=").append(typeId);
+        sb.append(", typeCode=").append(typeCode);
         sb.append(", typeName=").append(typeName);
         sb.append(", status=").append(status);
         sb.append(", createTime=").append(createTime);

@@ -395,63 +395,73 @@ public class RoleExample {
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIsNull() {
-            addCriterion("TYPE_ID is null");
+        public Criteria andTypeCodeIsNull() {
+            addCriterion("TYPE_CODE is null");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIsNotNull() {
-            addCriterion("TYPE_ID is not null");
+        public Criteria andTypeCodeIsNotNull() {
+            addCriterion("TYPE_CODE is not null");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdEqualTo(Long value) {
-            addCriterion("TYPE_ID =", value, "typeId");
+        public Criteria andTypeCodeEqualTo(String value) {
+            addCriterion("TYPE_CODE =", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotEqualTo(Long value) {
-            addCriterion("TYPE_ID <>", value, "typeId");
+        public Criteria andTypeCodeNotEqualTo(String value) {
+            addCriterion("TYPE_CODE <>", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdGreaterThan(Long value) {
-            addCriterion("TYPE_ID >", value, "typeId");
+        public Criteria andTypeCodeGreaterThan(String value) {
+            addCriterion("TYPE_CODE >", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("TYPE_ID >=", value, "typeId");
+        public Criteria andTypeCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("TYPE_CODE >=", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdLessThan(Long value) {
-            addCriterion("TYPE_ID <", value, "typeId");
+        public Criteria andTypeCodeLessThan(String value) {
+            addCriterion("TYPE_CODE <", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdLessThanOrEqualTo(Long value) {
-            addCriterion("TYPE_ID <=", value, "typeId");
+        public Criteria andTypeCodeLessThanOrEqualTo(String value) {
+            addCriterion("TYPE_CODE <=", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIn(List<Long> values) {
-            addCriterion("TYPE_ID in", values, "typeId");
+        public Criteria andTypeCodeLike(String value) {
+            addCriterion("TYPE_CODE like", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotIn(List<Long> values) {
-            addCriterion("TYPE_ID not in", values, "typeId");
+        public Criteria andTypeCodeNotLike(String value) {
+            addCriterion("TYPE_CODE not like", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdBetween(Long value1, Long value2) {
-            addCriterion("TYPE_ID between", value1, value2, "typeId");
+        public Criteria andTypeCodeIn(List<String> values) {
+            addCriterion("TYPE_CODE in", values, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotBetween(Long value1, Long value2) {
-            addCriterion("TYPE_ID not between", value1, value2, "typeId");
+        public Criteria andTypeCodeNotIn(List<String> values) {
+            addCriterion("TYPE_CODE not in", values, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeBetween(String value1, String value2) {
+            addCriterion("TYPE_CODE between", value1, value2, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeNotBetween(String value1, String value2) {
+            addCriterion("TYPE_CODE not between", value1, value2, "typeCode");
             return (Criteria) this;
         }
 

@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * DESC: null
+ * DESC: 角色权限表
  * TABLE: T_SYS_ROLE_PRIVILEGE
  */
 public class RolePrivilege implements Serializable {

@@ -64,10 +64,10 @@ public class User implements Serializable {
     private String customsSerialNum;
 
     /**
-     * 用户类型ID。
+     * 用户类型CODE。
 关联数据字典表。指定字典目录CODE：USER_TYPE
      */
-    private Long typeId;
+    private String typeCode;
 
     /**
      * 用户类型名称(本地账号、FCL账号)
@@ -209,12 +209,12 @@ public class User implements Serializable {
         this.customsSerialNum = customsSerialNum == null ? null : customsSerialNum.trim();
     }
 
-    public Long getTypeId() {
-        return typeId;
+    public String getTypeCode() {
+        return typeCode;
     }
 
-    public void setTypeId(Long typeId) {
-        this.typeId = typeId;
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode == null ? null : typeCode.trim();
     }
 
     public String getTypeName() {
@@ -314,7 +314,7 @@ public class User implements Serializable {
         sb.append(", accountNo=").append(accountNo);
         sb.append(", unifiedBusinessNum=").append(unifiedBusinessNum);
         sb.append(", customsSerialNum=").append(customsSerialNum);
-        sb.append(", typeId=").append(typeId);
+        sb.append(", typeCode=").append(typeCode);
         sb.append(", typeName=").append(typeName);
         sb.append(", status=").append(status);
         sb.append(", remark=").append(remark);

@@ -885,63 +885,73 @@ public class UserExample {
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIsNull() {
-            addCriterion("TYPE_ID is null");
+        public Criteria andTypeCodeIsNull() {
+            addCriterion("TYPE_CODE is null");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIsNotNull() {
-            addCriterion("TYPE_ID is not null");
+        public Criteria andTypeCodeIsNotNull() {
+            addCriterion("TYPE_CODE is not null");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdEqualTo(Long value) {
-            addCriterion("TYPE_ID =", value, "typeId");
+        public Criteria andTypeCodeEqualTo(String value) {
+            addCriterion("TYPE_CODE =", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotEqualTo(Long value) {
-            addCriterion("TYPE_ID <>", value, "typeId");
+        public Criteria andTypeCodeNotEqualTo(String value) {
+            addCriterion("TYPE_CODE <>", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdGreaterThan(Long value) {
-            addCriterion("TYPE_ID >", value, "typeId");
+        public Criteria andTypeCodeGreaterThan(String value) {
+            addCriterion("TYPE_CODE >", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("TYPE_ID >=", value, "typeId");
+        public Criteria andTypeCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("TYPE_CODE >=", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdLessThan(Long value) {
-            addCriterion("TYPE_ID <", value, "typeId");
+        public Criteria andTypeCodeLessThan(String value) {
+            addCriterion("TYPE_CODE <", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdLessThanOrEqualTo(Long value) {
-            addCriterion("TYPE_ID <=", value, "typeId");
+        public Criteria andTypeCodeLessThanOrEqualTo(String value) {
+            addCriterion("TYPE_CODE <=", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdIn(List<Long> values) {
-            addCriterion("TYPE_ID in", values, "typeId");
+        public Criteria andTypeCodeLike(String value) {
+            addCriterion("TYPE_CODE like", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotIn(List<Long> values) {
-            addCriterion("TYPE_ID not in", values, "typeId");
+        public Criteria andTypeCodeNotLike(String value) {
+            addCriterion("TYPE_CODE not like", value, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdBetween(Long value1, Long value2) {
-            addCriterion("TYPE_ID between", value1, value2, "typeId");
+        public Criteria andTypeCodeIn(List<String> values) {
+            addCriterion("TYPE_CODE in", values, "typeCode");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIdNotBetween(Long value1, Long value2) {
-            addCriterion("TYPE_ID not between", value1, value2, "typeId");
+        public Criteria andTypeCodeNotIn(List<String> values) {
+            addCriterion("TYPE_CODE not in", values, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeBetween(String value1, String value2) {
+            addCriterion("TYPE_CODE between", value1, value2, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeNotBetween(String value1, String value2) {
+            addCriterion("TYPE_CODE not between", value1, value2, "typeCode");
             return (Criteria) this;
         }
 

@@ -7,7 +7,7 @@ import java.util.Date;
  * DESC: 用户登录信息token表
  * TABLE: T_SYS_REDIS_SLAB
  */
-public class RedisSlab implements Serializable {
+public class redisSlab implements Serializable {
     /**
      * ID,自动增加
      */

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-public class RedisSlabExample {
+public class redisSlabExample {
     protected String orderByClause;
 
     protected boolean distinct;
@@ -15,7 +15,7 @@ public class RedisSlabExample {
 
     protected Integer limitSize;
 
-    public RedisSlabExample() {
+    public redisSlabExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 

@@ -40,7 +40,7 @@
             sys：系统 系统相关表，例如kafka表
             log: 日志 日志记录表，例如邮件发送日志表
         -->
-        <javaModelGenerator targetPackage="com.fedex.connect.common.model.biz" targetProject="src/main/java">
+        <javaModelGenerator targetPackage="com.fedex.connect.common.model.sys" targetProject="src/main/java">
             <!---enableSubPackages:如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性-->
             <property name="enableSubPackages" value="false"/>
             <!--该属性只对MyBatis3有效，如果true就会使用构造方法入参，如果false就会使用setter方式。默认为false-->
@@ -52,13 +52,13 @@
         </javaModelGenerator>
 
         <!-- 生成映射文件*.xml的位置-->
-        <sqlMapGenerator targetPackage="mapper.biz" targetProject="src/main/java/com/fedex/connect/common">
+        <sqlMapGenerator targetPackage="mapper.sys" targetProject="src/main/java/com/fedex/connect/common">
             <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
             <property name="enableSubPackages" value="false"/>
         </sqlMapGenerator>
 
         <!-- 生成DAO的包名和位置 -->
-        <javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.biz" targetProject="src/main/java">
+        <javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.sys" targetProject="src/main/java">
             <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
             <property name="enableSubPackages" value="false"/>
         </javaClientGenerator>
@@ -93,113 +93,119 @@
 <!--               selectByExampleQueryId="true">-->
 <!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_EMAIL_HISTORY.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-        <table tableName="T_BIZ_ATTACHMENT" domainObjectName="Attachment"
-               enableCountByExample="true" enableUpdateByExample="true"
-               enableDeleteByExample="true" enableSelectByExample="true"
-               selectByExampleQueryId="true">
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />
-        </table>
-        <table tableName="T_BIZ_UPLOAD_RECORD" domainObjectName="UploadRecord"
-               enableCountByExample="true" enableUpdateByExample="true"
-               enableDeleteByExample="true" enableSelectByExample="true"
-               selectByExampleQueryId="true">
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL" />
-        </table>
-<!--        <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"-->
-<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-<!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />-->
-<!--        </table>-->
-        <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"
-               enableCountByExample="true" enableUpdateByExample="true"
-               enableDeleteByExample="true" enableSelectByExample="true"
-               selectByExampleQueryId="true">
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />
-        </table>
-<!--        <table tableName="T_BIZ_EMAIL" domainObjectName="Email"-->
-<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-<!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_EMAIL.NEXTVAL FROM DUAL" />-->
-<!--        </table>-->
-<!--        <table tableName="T_BIZ_PUSH_OB" domainObjectName="PushOb"-->
-<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-<!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_PUSH_OB.NEXTVAL FROM DUAL" />-->
-<!--        </table>-->
-<!--        <table tableName="T_BIZ_PUSH_OB_DETAIL" domainObjectName="PushObDetail"-->
-<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-<!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_PUSH_OB_DETAIL.NEXTVAL FROM DUAL" />-->
-<!--        </table>-->
-
-
-
-<!--        <table tableName="T_BI_PORTCLEAR_EMAIL_MAPPING" domainObjectName="PortclearEmailMapping"-->
+<!--        <table tableName="T_LOG_USER_LOGIN_INFO" domainObjectName="UserLoginInfo"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->
 <!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BI_PORTCLEAR_EMAIL_MAPPING.NEXTVAL FROM DUAL" />-->
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_USER_LOGIN_INFO.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-
-<!--               <table tableName="T_SYS_REDIS_SLAB" domainObjectName="redisSlab"-->
-<!--                      enableCountByExample="true" enableUpdateByExample="true"-->
-<!--                      enableDeleteByExample="true" enableSelectByExample="true"-->
-<!--                      selectByExampleQueryId="true">-->
-<!--                   <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL" />-->
-<!--               </table>-->
-<!--        <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_STORAGE_HISTORY" domainObjectName="KafkaStorageHistory"-->
+<!--        <table tableName="T_BIZ_ATTACHMENT" domainObjectName="Attachment"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->
 <!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL" />-->
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-<!--        <table tableName="T_SYS_KAFKA_TEMPORARY_STORAGE" domainObjectName="KafkaTemporaryStorage"-->
+<!--        <table tableName="T_BIZ_UPLOAD_RECORD" domainObjectName="UploadRecord"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->
 <!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />-->
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-<!--        <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"-->
+<!--        <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->
 <!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />-->
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-<!--        <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"-->
+<!--        <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->
 <!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PRIVILEGE.NEXTVAL FROM DUAL" />-->
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-<!--        <table tableName="T_SYS_ROLE" domainObjectName="Role"-->
+<!--        <table tableName="T_BIZ_EMAIL" domainObjectName="Email"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->
 <!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE.NEXTVAL FROM DUAL" />-->
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_EMAIL.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-<!--        <table tableName="T_SYS_ROLE_PRIVILEGE" domainObjectName="RolePrivilege"-->
+<!--        <table tableName="T_BIZ_PUSH_OB" domainObjectName="PushOb"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->
 <!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />-->
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_PUSH_OB.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-<!--        <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"-->
+<!--        <table tableName="T_BIZ_PUSH_OB_DETAIL" domainObjectName="PushObDetail"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->
 <!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />-->
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_PUSH_OB_DETAIL.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-<!--        <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"-->
+
+
+
+<!--        <table tableName="T_BI_PORTCLEAR_EMAIL_MAPPING" domainObjectName="PortclearEmailMapping"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->
 <!--               selectByExampleQueryId="true">-->
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL" />-->
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BI_PORTCLEAR_EMAIL_MAPPING.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
 
+               <table tableName="T_SYS_REDIS_SLAB" domainObjectName="redisSlab"
+                      enableCountByExample="true" enableUpdateByExample="true"
+                      enableDeleteByExample="true" enableSelectByExample="true"
+                      selectByExampleQueryId="true">
+                   <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL" />
+               </table>
+        <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_STORAGE_HISTORY" domainObjectName="KafkaStorageHistory"
+               enableCountByExample="true" enableUpdateByExample="true"
+               enableDeleteByExample="true" enableSelectByExample="true"
+               selectByExampleQueryId="true">
+            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL" />
+        </table>
+        <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_TEMPORARY_STORAGE" domainObjectName="KafkaTemporaryStorage"
+               enableCountByExample="true" enableUpdateByExample="true"
+               enableDeleteByExample="true" enableSelectByExample="true"
+               selectByExampleQueryId="true">
+            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />
+        </table>
+        <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"
+               enableCountByExample="true" enableUpdateByExample="true"
+               enableDeleteByExample="true" enableSelectByExample="true"
+               selectByExampleQueryId="true">
+            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />
+        </table>
+        <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"
+               enableCountByExample="true" enableUpdateByExample="true"
+               enableDeleteByExample="true" enableSelectByExample="true"
+               selectByExampleQueryId="true">
+            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PRIVILEGE.NEXTVAL FROM DUAL" />
+        </table>
+        <table tableName="T_SYS_ROLE" domainObjectName="Role"
+               enableCountByExample="true" enableUpdateByExample="true"
+               enableDeleteByExample="true" enableSelectByExample="true"
+               selectByExampleQueryId="true">
+            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE.NEXTVAL FROM DUAL" />
+        </table>
+        <table tableName="T_SYS_ROLE_PRIVILEGE" domainObjectName="RolePrivilege"
+               enableCountByExample="true" enableUpdateByExample="true"
+               enableDeleteByExample="true" enableSelectByExample="true"
+               selectByExampleQueryId="true">
+            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />
+        </table>
+        <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"
+               enableCountByExample="true" enableUpdateByExample="true"
+               enableDeleteByExample="true" enableSelectByExample="true"
+               selectByExampleQueryId="true">
+            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />
+        </table>
+        <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"
+               enableCountByExample="true" enableUpdateByExample="true"
+               enableDeleteByExample="true" enableSelectByExample="true"
+               selectByExampleQueryId="true">
+            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL" />
+        </table>
+
 
 <!--        <table tableName="T_BI_DICTIONARY_ENTRIES" domainObjectName="DictionaryEntries"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->