Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

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

@@ -110,7 +110,6 @@
        String uaid = zInfoUser.getUaid();
        List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
        List<Long> collect = byUaidToFaid.stream().map(ZInfoUser::getSysId).collect(Collectors.toList());

        LambdaQueryWrapper<ZHealthBase> lqw = new LambdaQueryWrapper<>();
        lqw.in(ZHealthBase::getUid,collect);