4 hete · db81a7ea2f
--- a/.env.development
+++ b/.env.development
@@ -12,7 +12,7 @@ ENV = 'development'
 
				 
			
 
				 # 线上测试
			
 
				 VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
			
 
				-# VUE_APP_BASE_API = 'http://10.0.11.126:8082/'
			
 
				+# VUE_APP_BASE_API = 'http://10.0.11.178:8082/'
			
 
				 
			
 
				 # VUE_APP_BASE_API = 'http://36.155.144.182:18090/'
			
 
				 
			
--- a/dist-测试.zip
+++ b/dist-测试.zip
--- a/dist/index.html
+++ b/dist/index.html
--- a/src/views/console/user/index.vue
+++ b/src/views/console/user/index.vue
@@ -25,6 +25,8 @@
 
				         @sort-change="tableSort"
			
 
				         :max-height="myHeight"
			
 
				       >
			
 
				+        <el-table-column label="牧场" prop="pastureName"  header-align="center" width="120px" align="center">
			
 
				+        </el-table-column>
			
 
				         <el-table-column label="用户名称" header-align="center" width="120px" align="center">
			
 
				           <template slot-scope="scope">
			
 
				             <span>{{ scope.row.username }}</span>