Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml

@@ -210,17 +210,17 @@
        <result property="updateUser"    column="update_user"    />
        <result property="updateTime"    column="update_time"    />
        <result property="isDeleted"    column="is_deleted"    />
        <result property="legalTempAddress"    column="legal_temp_address"    />
        <result property="legalAge"    column="legal_age"    />
        <result property="legalGender"    column="legal_gender"    />
        <result property="legalIdCard"    column="legal_id_card"    />
        <result property="legalCardType"    column="legal_card_type"    />
        <result property="legalRegisteredAddress"    column="legal_registered_address"    />
        <result property="legalJobNature"    column="legal_job_nature"    />
        <result property="legalWxAccount"    column="legal_wx_account"    />
        <result property="birthday"    column="birthday"    />
        <result property="ethnicity"    column="ethnicity"    />
        <result property="employer"    column="employer"    />
<!--        <result property="legalTempAddress"    column="legal_temp_address"    />-->
<!--        <result property="legalAge"    column="legal_age"    />-->
<!--        <result property="legalGender"    column="legal_gender"    />-->
<!--        <result property="legalIdCard"    column="legal_id_card"    />-->
<!--        <result property="legalCardType"    column="legal_card_type"    />-->
<!--        <result property="legalRegisteredAddress"    column="legal_registered_address"    />-->
<!--        <result property="legalJobNature"    column="legal_job_nature"    />-->
<!--        <result property="legalWxAccount"    column="legal_wx_account"    />-->
<!--        <result property="birthday"    column="birthday"    />-->
<!--        <result property="ethnicity"    column="ethnicity"    />-->
<!--        <result property="employer"    column="employer"    />-->
    </resultMap>

    <sql id="selectJczzPlaceExt">
@@ -239,15 +239,7 @@
            create_time,
            update_user,
            update_time,
            is_deleted,
            legal_temp_address,
            legal_age,
            legal_gender,
            legal_id_card,
            legal_card_type,
            legal_registered_address,
            legal_job_nature,
            legal_wx_account
            is_deleted
        from
            jczz_place_ext
    </sql>