Merge branch 'master' of http://39.104.94.153:3000/yf_zd/second

apps/Equipment/urls.py

@@ -255,6 +255,8 @@ urlpatterns = [
     url(r'^garden_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\garden_photo'}), #本地
     url(r'^guser_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\guser_photo'}), #本地
     url(r'^map_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\map_photo'}), #本地
+    url(r'^media/uploads/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\media\\uploads'}), #本地
+    
     
 
     # url(r'^hotel_photo/(?P<path>.*)', serve, {'document_root': '/home/web/second/second/hotel_photo'}), #本地