Merge branch 'cheney' into dev

src/views/shop-information/useColumns.tsx

@@ -6,8 +6,15 @@ import * as api from '/@/views/shop-information/api';
 const countryInfoStore = useCountryInfoStore();
 
 export const companySelect: Ref<any[]> = ref([]);
-const ret = await useResponse({}, api.getCompanySelect);
-companySelect.value = ret.data;
+// const ret = await useResponse({}, api.getCompanySelect);
+// companySelect.value = ret.data;
+
+async function main() {
+  const result = await api.getCompanySelect();
+  companySelect.value = result.data;
+}
+
+main();
 
 export const platformColumns = [
   { type: 'seq', width: 50, align: 'center', fixed: 'left' },