diff --git a/PriceSystem/rent_test.py b/PriceSystem/rent_test.py index f52d519..9e45f14 100644 --- a/PriceSystem/rent_test.py +++ b/PriceSystem/rent_test.py @@ -20,12 +20,7 @@ ct='上海' rl='黄浦' lk='伯爵居'#上海闵行闵浦新苑一村普陀曹杨一村上海 #黄浦伯爵居静安泰安里长宁新泾北苑 -<<<<<<< HEAD timm=20180430 -======= -timm=20170430 ->>>>>>> 217a0f5eecab70d06d98454cb27ce5a1561552f1 - timd=20160603 a=time.time() rentPrice.save_to_mongo(ct,rl,lk,timd,timm)