Merge branch 'dev/feat/partner1.1_20230727' into hxd/feat/interviewSelect

This commit is contained in:
xiaodong.hu
2023-07-20 11:35:12 +08:00
11 changed files with 41 additions and 30 deletions

View File

@@ -6,17 +6,17 @@
<idArg column="id" javaType="java.lang.Long" jdbcType="BIGINT" />
<arg column="interview_plan_id" javaType="java.lang.Long" jdbcType="BIGINT" />
<arg column="operator_user_id" javaType="java.lang.String" jdbcType="VARCHAR" />
<arg column="type" javaType="java.lang.Byte" jdbcType="TINYINT" />
<arg column="status" javaType="java.lang.Byte" jdbcType="TINYINT" />
<arg column="type" javaType="java.lang.Integer" jdbcType="TINYINT" />
<arg column="status" javaType="java.lang.Integer" jdbcType="TINYINT" />
<arg column="files" javaType="java.lang.String" jdbcType="VARCHAR" />
<arg column="description" javaType="java.lang.String" jdbcType="VARCHAR" />
<arg column="inspection_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP" />
<arg column="inspection_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
<arg column="creator" javaType="java.lang.String" jdbcType="VARCHAR" />
<arg column="updator" javaType="java.lang.String" jdbcType="VARCHAR" />
<arg column="remark" javaType="java.lang.String" jdbcType="VARCHAR" />
<arg column="deleted" javaType="java.lang.Boolean" jdbcType="BIT" />
<arg column="create_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
<arg column="update_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP" />
<arg column="update_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
</constructor>
</resultMap>
<sql id="Base_Column_List">

View File

@@ -9,10 +9,10 @@
<arg column="operation_type" javaType="java.lang.Byte" jdbcType="TINYINT" />
<arg column="description" javaType="java.lang.String" jdbcType="VARCHAR" />
<arg column="files" javaType="java.lang.String" jdbcType="VARCHAR" />
<arg column="operation_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP" />
<arg column="operation_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
<arg column="remark" javaType="java.lang.String" jdbcType="VARCHAR" />
<arg column="create_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
<arg column="update_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP" />
<arg column="update_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
</constructor>
</resultMap>
<sql id="Base_Column_List">

View File

@@ -8,9 +8,9 @@
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="deleted" jdbcType="BIT" property="deleted"/>
<result column="create_id" jdbcType="VARCHAR" property="createId"/>
<result column="create_time" jdbcType="BIGINT" property="createTime"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_id" jdbcType="VARCHAR" property="updateId"/>
<result column="update_time" jdbcType="BIGINT" property="updateTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<sql id="Base_Column_List">
id, region_id, user_id, type, deleted, create_id, create_time, update_id, update_time