解决冲突

yd-api/src/main/resources/mapper/customer/AclCustomerMapper.xml

@@ -6,7 +6,7 @@
     <result column="role" jdbcType="INTEGER" property="role" />
     <result column="role" jdbcType="INTEGER" property="role" />
     <result column="account_id" jdbcType="VARCHAR" property="accountId" />
     <result column="account_id" jdbcType="VARCHAR" property="accountId" />
     <result column="login" jdbcType="VARCHAR" property="login" />
     <result column="login" jdbcType="VARCHAR" property="login" />
-    <result column="mobile_no" jdbcType="VARCHAR" property="mobileNo" />
+    <result column="mobile_no" jdbcType="VARCHAR" property="mobileNo" typeHandler="com.yd.util.deshandler.DESTypeHandler"/>
     <result column="authen_code" jdbcType="VARCHAR" property="authenCode" />
     <result column="authen_code" jdbcType="VARCHAR" property="authenCode" />
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="email" jdbcType="VARCHAR" property="email" />
     <result column="email" jdbcType="VARCHAR" property="email" />
@@ -21,7 +21,7 @@
     <result column="en_firstname" jdbcType="VARCHAR" property="enFirstname" />
     <result column="en_firstname" jdbcType="VARCHAR" property="enFirstname" />
     <result column="en_lastname" jdbcType="VARCHAR" property="enLastname" />
     <result column="en_lastname" jdbcType="VARCHAR" property="enLastname" />
     <result column="id_type_id" jdbcType="BIGINT" property="idTypeId" />
     <result column="id_type_id" jdbcType="BIGINT" property="idTypeId" />
-    <result column="id_no" jdbcType="VARCHAR" property="idNo" />
+    <result column="id_no" jdbcType="VARCHAR" property="idNo" typeHandler="com.yd.util.deshandler.DESTypeHandler"/>
     <result column="gender" jdbcType="INTEGER" property="gender" />
     <result column="gender" jdbcType="INTEGER" property="gender" />
     <result column="birth_date" jdbcType="DATE" property="birthDate" />
     <result column="birth_date" jdbcType="DATE" property="birthDate" />
     <result column="last_login_time" jdbcType="TIMESTAMP" property="lastLoginTime" />
     <result column="last_login_time" jdbcType="TIMESTAMP" property="lastLoginTime" />

yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml

@@ -692,9 +692,9 @@
     a.customer_id opportunityId,
     a.customer_id opportunityId,
     c.NAME name,
     c.NAME name,
     c.mobile_no mobileNo,
     c.mobile_no mobileNo,
-    p.mkt_campaign opportunityFrom,
+    p.mkt_campaign mdDropOptionId,
     date_format(a.created_at, '%Y-%m-%d %H:%i:%s') opportunityDate,
     date_format(a.created_at, '%Y-%m-%d %H:%i:%s') opportunityDate,
-    if (p.mkt_campaign is null ,'',(SELECT cam.name from ag_md_mk_campaign cam where cam.id = p.mkt_campaign )) mdDropOptionId,
+    if (p.mkt_campaign is null ,'',(SELECT cam.name from ag_md_mk_campaign cam where cam.id = p.mkt_campaign )) opportunityFrom,
     a.id leadsAssignedId
     a.id leadsAssignedId
     FROM
     FROM
     ag_mkt_leads_assigneds a
     ag_mkt_leads_assigneds a