Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasyFrontEnd into Dev

# Conflicts:
#	FrontEnd/pages/exhibition/index.vue

FrontEnd/pages/exhibition/index.vue

@@ -562,7 +562,7 @@ export default {
         .catch((err) => {
           console.log(err);
         });
-    },
+    }, 
     async getExhibitionCard() {
 
       // this.query = this.query + "工具機";