解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/迁移记录-DB变更记录/202509041017
+++ b/迁移记录-DB变更记录/202509041017
@@ -0,0 +1,46 @@
+INSERT INTO "public"."sys_menu" (
+  "menu_name",
+  "parent_id",
+  "order_num",
+  "path",
+  "component",
+  "query",
+  "route_name",
+  "is_frame",
+  "is_cache",
+  "menu_type",
+  "visible",
+  "status",
+  "perms",
+  "icon",
+  "create_by",
+  "create_time",
+  "update_by",
+  "update_time",
+  "remark"
+)
+VALUES
+(
+  '药房月结',
+  376,
+  9,
+  'pharmacyMonthlybalance',
+  'medicationmanagement/statisticalManagement/pharmacyMonthlybalance',
+  NULL,
+  NULL,
+  '1',
+  '0',
+  'C',
+  '0',
+  '0',
+  NULL,
+  NULL,
+  'admin',
+  '2025-09-01 16:38:52.620255',
+  NULL,
+  NULL,
+  NULL
+);
+-- 插入系统菜单数据插入的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509041017insert_sys_menu', '1.0.0');