提交merge1.3

迁移记录-DB变更记录/202510301113 add_column adm_healthcare_service.sql

@@ -1,14 +1,7 @@
-<<<<<<< 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');