Merge remote-tracking branch 'origin/master'

Administrator

2023-08-22 e8a4f9014fbea4159ea15642226c6793d57d13ee

 ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java

@@ -202,7 +202,9 @@
                    if (lon == null || lat == null) {
                        continue;
                    }
                    Point point2D=new Point(lon,lat);
                    Point point2D=new Point();
                    point2D.setLongitude(lon);
                    point2D.setLatitude(lat);
                    boolean inPolygon = GisTool.isInPolygon(point2D, partitionLocation);
                    if (inPolygon) {
                        Map<String, Object> params = new HashMap<>();