Merge remote-tracking branch 'origin/master'

lin

2024-03-11 c5a0d277347f9ecaaf934b648b6edf5b9119516b

 src/main/java/org/springblade/modules/partyOrganization/mapper/PartyOrganizationMapper.xml

@@ -15,7 +15,6 @@
        left join jczz_household jh ON jh.id = jpom.household_id
        WHERE
        jpo.is_deleted = 0

        <if test="vo.organizationName != null and vo.organizationName != ''">
            AND jpo.organization_name LIKE CONCAT('%',#{vo.organizationName},'%')
        </if>