From 88cd67a3fe43aeb9b63612b443a01178b0b2b72b Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Wed, 19 Nov 2025 11:49:40 +0800 Subject: [PATCH] update --- .../fangjia/script/gj/district/DistrictLocationGeo.groovy | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictLocationGeo.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictLocationGeo.groovy index 999e954a2..512e54ee4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictLocationGeo.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictLocationGeo.groovy @@ -6,14 +6,11 @@ import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils import com.mongodb.BasicDBList import com.mongodb.BasicDBObject import com.mongodb.DBCollection -<<<<<<< .mine + import net.sf.json.JSONNull import org.bson.types.ObjectId -======= ->>>>>>> .theirs - class DistrictLocationGeo { final DBCollection seaweedGaodePoisColl = MongoUtils.getCollectionByName("fangjia", "seaweed_gaode_pois", "192.168.0.235", 27018)