提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/迁移记录-DB变更记录/202510281101
+++ b/迁移记录-DB变更记录/202510281101
@@ -1,14 +1,7 @@
-<<<<<<< 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');