merge origin main conflicts resolved

2026-04-23 13:20:29 +08:00
parent db90e2a084 f48818b14d
commit f6b5940a27
14 changed files with 236 additions and 199 deletions
--- a/ruoyi-ui/src/store/modules/oaProjectDashboard2.js
+++ b/ruoyi-ui/src/store/modules/oaProjectDashboard2.js
@@ -24,7 +24,7 @@ const state = {

  projectQuery: {
    pageNum: 1,
-    pageSize: 10,
+    pageSize: 15,
    keyword: ''
  },
  projectList: [],