Merge branch 'v2' into pr_5

# Conflicts: # applications/view/__init__.py
2021-06-13 16:14:23 +08:00
parent 9e8a5357be 14a32e6d3c
commit 62bd10cc60
33 changed files with 191 additions and 167 deletions
@@ -4,7 +4,7 @@ from marshmallow import INCLUDE
 from applications.common.utils.http import success_api, fail_api
 from applications.common.utils.rights import authorize
 from applications.common.utils.validate import check_data
-from applications.models import DeptSchema
+from applications.schemas import DeptSchema
 from applications.common.admin import dept_curd as dept_curd

 dept_bp = Blueprint('dept', __name__, url_prefix='/dept')