Merge branch 'farmer' of http://www.sysuimars.cn:3000/feiniao/feiniao-farm-h5 into farmer

package.json

@@ -7,7 +7,7 @@
     "servelocal": "vue-cli-service serve --mode local",
     "servepro": "vue-cli-service serve --mode pro",
     "build": "vue-cli-service build --mode pro",
-    "build2": "vue-cli-service build --mode dev",
+    "build2": "vue-cli-service build --mode pro",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {