合并冲突

vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
 
 module.exports = {
   publicPath: "./",
-  outputDir: "cattletrading",
+  outputDir: "trackManager",
   lintOnSave: false,
   productionSourceMap: false,
   devServer: {