冲突修改

src/views/client/index.vue

@@ -293,14 +293,14 @@ export default {
         this.loading = false
       })
     },
-    getSelect() {
-      this.$api.getDict().then(reponse => {
-        for (let i = 0; i < reponse.data.TENANT_TYPE.length; i++) {
-          this.select[i] = reponse.data.TENANT_TYPE[i]
-        }
-        // this.$set(this.select, reponse.data.TENANT_TYPE)
-      })
-    },
+    // getSelect() {
+    //   this.$api.getDict().then(reponse => {
+    //     for (let i = 0; i < reponse.data.TENANT_TYPE.length; i++) {
+    //       this.select[i] = reponse.data.TENANT_TYPE[i]
+    //     }
+    //     // this.$set(this.select, reponse.data.TENANT_TYPE)
+    //   })
+    // },
     handleCurrentChange(val) {
       this.queryParams.current = val;
       this.getList();

src/views/user/index.vue

@@ -599,12 +599,11 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-	import Treeselect from "@riophae/vue-treeselect";
-	import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+	import Treeselect from "@riophae/vue-treeselect"
+	import "@riophae/vue-treeselect/dist/vue-treeselect.css"
 	export default {
 		components: {
-			Treeselect,
+			Treeselect
 		},
 		data() {
 			return {