update
This commit is contained in:
+1
-4
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user