flat: 合并

packageA/pages/exhibitors/exhibitors.vue

@@ -121,7 +121,7 @@ const pageState = reactive({
     maxPage: 1,
     pageSize: 10,
 });
-const hasnext = ref(true);
+const hasnext = ref(false);
 
 const zphId = ref('');
 const pageOptions = ref({});

packageA/pages/myResume/myResume.vue

@@ -186,7 +186,8 @@ function uploadResume(tempFilePath, loading) {
     header['Authorization'] = encodeURIComponent(Authorization);
     return new Promise((resolve, reject) => {
         uni.uploadFile({
-            url: config.baseUrl + '/app/oss/uploadToObs',
+            url: config.baseUrl + '/app/user/resume/recognition',
+            // url: config.baseUrl + '/app/oss/uploadToObs',
             filePath: tempFilePath,
             name: 'file',
             header,