Merge remote-tracking branch 'origin/dev_20210330' into dev_20210330

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

@@ -89,7 +89,8 @@
       is_profile_show, is_name_show, is_mobile_show,
       education_level, graduated_university, mentor_id,
       introducer_id, gender, contract_oss_path,
-      hiring_basic_info_id, can_login_dyd, can_see_salary_list
+      hiring_basic_info_id, can_login_dyd, can_see_salary_list,
+      detail_address
       )
     values (#{insurerId,jdbcType=BIGINT}, #{insurerBranchId,jdbcType=BIGINT}, #{deptId,jdbcType=BIGINT}, 
       #{subordinateSystemId,jdbcType=BIGINT}, #{practitionerCode,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
@@ -105,7 +106,8 @@
       #{isProfileShow,jdbcType=INTEGER}, #{isNameShow,jdbcType=INTEGER}, #{isMobileShow,jdbcType=INTEGER},
       #{educationLevel,jdbcType=VARCHAR}, #{graduatedUniversity,jdbcType=VARCHAR}, #{mentorId,jdbcType=BIGINT},
       #{introducerId,jdbcType=BIGINT}, #{gender,jdbcType=INTEGER}, #{contractOssPath,jdbcType=VARCHAR},
-      #{hiringBasicInfoId,jdbcType=BIGINT}, #{canLoginDyd,jdbcType=BIGINT}, #{canSeeSalaryList,jdbcType=BIGINT}
+      #{hiringBasicInfoId,jdbcType=BIGINT}, #{canLoginDyd,jdbcType=BIGINT}, #{canSeeSalaryList,jdbcType=BIGINT},
+      #{detailAddress}
       )
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclPractitioner" useGeneratedKeys="true">
@@ -244,6 +246,9 @@
       <if test="canSeeSalaryList != null">
         can_see_salary_list,
       </if>
+      <if test="detailAddress != null">
+        detail_address,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="insurerId != null">
@@ -378,6 +383,9 @@
       <if test="canSeeSalaryList != null">
         #{canSeeSalaryList,jdbcType=BIGINT},
       </if>
+      <if test="detailAddress != null">
+        #{detailAddress,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.customer.AclPractitioner">