Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

# Conflicts:
#	src/router/routes/basic.ts

src/views/generator/desktop/components/designer/infos/Image.vue

@@ -45,7 +45,7 @@
     );
     async function getImage() {
         if (props.config.folderId) {
-            let fileList = await getFileList({ folderId: props.config.folderId });
+            let fileList = await getFileList({ tableId: props.config.folderId });
             if (fileList.length) {
                 imageUrl.value = fileList[0].fileUrl;
             }