解决合并冲突

迁移记录-DB变更记录/202510281101 add_column_adm_practitioner.sql

@@ -0,0 +1,7 @@
+ALTER TABLE "public"."adm_practitioner" 
+  ADD COLUMN "pos_no" varchar(255) DEFAULT '';
+
+COMMENT ON COLUMN "public"."adm_practitioner"."pos_no" IS 'pos机编号';
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510281101 add_column_adm_practitioner', '1.0.0');