提交merge1.3

2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
--- a/迁移记录-DB变更记录/202510301113
+++ b/迁移记录-DB变更记录/202510301113
@@ -1,7 +1,14 @@
+<<<<<<< HEAD
 ALTER TABLE "adm_healthcare_service" 
  ADD COLUMN "bus_no" varchar(255);

 COMMENT ON COLUMN "adm_healthcare_service"."bus_no" IS '编码';
+=======
+ALTER TABLE "public"."adm_healthcare_service" 
+  ADD COLUMN "bus_no" varchar(255);
+
+COMMENT ON COLUMN "public"."adm_healthcare_service"."bus_no" IS '编码';
+>>>>>>> v1.3
   -- 插入为tmp_activity_device表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
 VALUES ('202510301113 add_column adm_healthcare_service', '1.0.0');