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

# Conflicts: # FrontEnd/pages/exhibition/index.vue
解決衝突
1 changed files with 0 additions and 1 deletions
--- a/FrontEnd/pages/exhibition/index.vue
+++ b/FrontEnd/pages/exhibition/index.vue
@ -567,7 +567,6 @@ export default {

      // this.query = this.query + "工具機";
      // console.log("getExhibitionCard"+": "+this.query)
-
      await this.$axios
        .get(
          `/trending/api/Exhibition/Cards?Lang=${this.$i18n.localeProperties["langQuery"]}` +
Author	SHA1	Message	Date
18300102974	eeee98bb83	Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasyFrontEnd into Dev # Conflicts: # FrontEnd/pages/exhibition/index.vue	2 years ago
18300102974	f388e9a6ae	解決衝突	2 years ago