Merge remote-tracking branch 'origin/master'

linwei

2024-01-09 269daa8c7bba1547ffa4c9fa7700b920bb5a6b13

 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml

@@ -709,6 +709,7 @@
                and CONCAT(jh.name,jh.phone_number) like CONCAT ('%', #{household.searchKey},'%')
            </if>
            and jh.is_deleted = 0
            and jh.name != '' and jh.name is not null
            order by jh.create_time desc,jh.id desc
            <if test="household.limit!=null">
                limit #{household.limit}