Merge upstream/main into dev: 解决冲突保留 API 服务功能

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "weflow",
-  "version": "1.5.3",
+  "version": "1.5.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "weflow",
-      "version": "1.5.3",
+      "version": "1.5.2",
       "hasInstallScript": true,
       "dependencies": {
         "better-sqlite3": "^12.5.0",