Merge

Author: longyn

tyadmin_api_cli/antd/__init__.py

@@ -6,11 +6,7 @@ import proxy from './proxy';
 var fs = require("fs");
 const path = require('path');
 const { REACT_APP_ENV } = process.env;
-<<<<<<< HEAD
-const auto_route = eval(fs.readFileSync(path.join(__dirname, 'route.js')).toString());
-=======
 const auto_route = eval(fs.readFileSync(path.join(__dirname, 'routes.js')).toString());
->>>>>>> b80b8f7... rebase & merge
 export default defineConfig({
     hash: true,
     antd: {},

tyadmin_api_cli/antd_full_templates/config/auto_menu.json

@@ -0,0 +1 @@
+alert("hi,mtianyan")