Commit 6cfc9cd2 authored by 林颖's avatar 林颖

Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into ly_dev

已跑过能跑通
============ 186 passed, 3 skipped, 4 warnings in 123.52s (0:02:03) ============
# Conflicts:
#	path_setting.py
parents 6a3ad08b 296c1e5e
......@@ -103,3 +103,5 @@ venv.bak/
# mypy
.mypy_cache/
host.yaml
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment