Merge remote-tracking branch 'origin/master'

feige

2024-11-19 63240c3b7edb2a149511fdbe4108755ad60db91f

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java

@@ -69,9 +69,10 @@
    }

    @Override
    public ZfFamily getByName(String familyName) {
    public ZfFamily getByName(String familyName, Integer clanId) {
        LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZfFamily::getName,familyName);
        lqw.eq(ZfFamily::getClanId, clanId);
        return getOne(lqw);
    }