Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 22342c6e9a1dd8cbc129cb083cc13d16a8322195

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java

@@ -22,10 +22,7 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
@@ -163,6 +160,7 @@
            convenientElevatingPointVO.setDistance(distance);
            convenientElevatingPointVOS.add(convenientElevatingPointVO);
        });
        Collections.sort(convenientElevatingPointVOS);
        return R.ok(convenientElevatingPointVOS);

    }