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
@@ -3,7 +3,8 @@ from sqlalchemy import desc

 from applications.common.utils.http import table_api
 from applications.common.utils.rights import authorize
-from applications.models import AdminLog, LogSchema
+from applications.models import AdminLog
+from applications.schemas import LogSchema
 from applications.common.curd import model_to_dicts

 admin_log = Blueprint('adminLog', __name__, url_prefix='/admin/log')
@@ -1,5 +1,4 @@
 from flask import Blueprint, render_template, request, jsonify
-
 from applications.common.utils.http import table_api, success_api, fail_api
 from applications.common.utils.rights import authorize
 from applications.common.utils.validate import xss_escape