提交merge1.3

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

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