Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-04 3486499f56e487cd6df88a8fa2448ff72d72a1e0

 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java

@@ -213,6 +213,9 @@
        List<YwPoint> list = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(YwPoint::getUnitId, unitId)
                .like(YwPoint::getPointName, keyword)
                .or()
                .eq(YwPoint::getUnitId, unitId)
                .like(YwPoint::getSerialNumber, keyword)
                .list();
        List data = list.stream().map(item -> {
            Map map = new HashMap<String, Object>();