resolve conflict

Author: Thomas

.gitignore

@@ -10,8 +10,8 @@ client/packages/lowcoder-plugin-demo/.yarn/install-state.gz
 client/packages/lowcoder-plugin-demo/yarn.lock
 client/packages/lowcoder-plugin-demo/.yarn/cache/@types-node-npm-16.18.68-56f72825c0-094ae9ed80.zip
 application-dev.yml
-server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml
-server/api-service/lowcoder-server/src/main/resources/application-debug.yaml
+application-lowcoder.yml
+application-debug.yaml
+application-dev-localhost.yaml
 .vscode/settings.json
-.vscode/launch.json
-server/api-service/lowcoder-server/src/main/resources/application-debug.yaml
+.vscode/launch.json

client/packages/lowcoder-comps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-comps",
-  "version": "2.4.5",
+  "version": "2.4.7",
   "type": "module",
   "license": "MIT",
   "dependencies": {