Merge branch 'master' into 'pre'

Master See merge request !4

Merge branch 'master' into 'pre'
Master See merge request !4
01b20b45 · 李小芳 · e3439925 · a32d15c8 · 01b20b45 · 01b20b45
Commit 01b20b45 authored Dec 27, 2019 by 李小芳
31 changed files
--- a/dymas/__pycache__/__init__.cpython-36.pyc
+++ b/dymas/__pycache__/__init__.cpython-36.pyc
--- a/dymas/__pycache__/base.cpython-36.pyc
+++ b/dymas/__pycache__/base.cpython-36.pyc
--- a/dymas/__pycache__/celery.cpython-36.pyc
+++ b/dymas/__pycache__/celery.cpython-36.pyc
--- a/dymas/__pycache__/devel.cpython-36.pyc
+++ b/dymas/__pycache__/devel.cpython-36.pyc
--- a/dymas/__pycache__/doris_injection.cpython-36.pyc
+++ b/dymas/__pycache__/doris_injection.cpython-36.pyc
--- a/dymas/__pycache__/log_settings.cpython-36.pyc
+++ b/dymas/__pycache__/log_settings.cpython-36.pyc
--- a/dymas/__pycache__/routers.cpython-36.pyc
+++ b/dymas/__pycache__/routers.cpython-36.pyc
--- a/dymas/__pycache__/system.cpython-36.pyc
+++ b/dymas/__pycache__/system.cpython-36.pyc
--- a/extend/models/__pycache__/gold.cpython-36.pyc
+++ b/extend/models/__pycache__/gold.cpython-36.pyc
--- a/hera/queries/__pycache__/__init__.cpython-36.pyc
+++ b/hera/queries/__pycache__/__init__.cpython-36.pyc
--- a/hera/queries/__pycache__/city_rank.cpython-36.pyc
+++ b/hera/queries/__pycache__/city_rank.cpython-36.pyc
--- a/rank/views/__pycache__/__init__.cpython-36.pyc
+++ b/rank/views/__pycache__/__init__.cpython-36.pyc
--- a/rank/views/__pycache__/interpose.cpython-36.pyc
+++ b/rank/views/__pycache__/interpose.cpython-36.pyc
--- a/rank/views/__pycache__/stat.cpython-36.pyc
+++ b/rank/views/__pycache__/stat.cpython-36.pyc
--- a/rank/views/__pycache__/strategy.cpython-36.pyc
+++ b/rank/views/__pycache__/strategy.cpython-36.pyc
--- a/recommend/utils/__pycache__/diary_portrait.cpython-36.pyc
+++ b/recommend/utils/__pycache__/diary_portrait.cpython-36.pyc
--- a/recommend/views/__pycache__/content.cpython-36.pyc
+++ b/recommend/views/__pycache__/content.cpython-36.pyc
--- a/recommend/views/__pycache__/feed.cpython-36.pyc
+++ b/recommend/views/__pycache__/feed.cpython-36.pyc
--- a/search/utils/__pycache__/board.cpython-36.pyc
+++ b/search/utils/__pycache__/board.cpython-36.pyc
--- a/search/utils/__pycache__/question.cpython-36.pyc
+++ b/search/utils/__pycache__/question.cpython-36.pyc
--- a/search/utils/__pycache__/recommend.cpython-36.pyc
+++ b/search/utils/__pycache__/recommend.cpython-36.pyc
--- a/search/utils/__pycache__/subscript_article.cpython-36.pyc
+++ b/search/utils/__pycache__/subscript_article.cpython-36.pyc
--- a/search/views/__pycache__/answer.cpython-36.pyc
+++ b/search/views/__pycache__/answer.cpython-36.pyc
--- a/search/views/__pycache__/article.cpython-36.pyc
+++ b/search/views/__pycache__/article.cpython-36.pyc
--- a/search/views/__pycache__/board.cpython-36.pyc
+++ b/search/views/__pycache__/board.cpython-36.pyc
--- a/search/views/__pycache__/doctor.cpython-36.pyc
+++ b/search/views/__pycache__/doctor.cpython-36.pyc
--- a/search/views/__pycache__/home_feed.cpython-36.pyc
+++ b/search/views/__pycache__/home_feed.cpython-36.pyc
--- a/search/views/__pycache__/principal_page.cpython-36.pyc
+++ b/search/views/__pycache__/principal_page.cpython-36.pyc
--- a/search/views/__pycache__/question.cpython-36.pyc
+++ b/search/views/__pycache__/question.cpython-36.pyc
--- a/search/views/__pycache__/subscript_article.cpython-36.pyc
+++ b/search/views/__pycache__/subscript_article.cpython-36.pyc
--- a/search/views/__pycache__/wiki.cpython-36.pyc
+++ b/search/views/__pycache__/wiki.cpython-36.pyc