Merge branch 'dev_group_code' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.4__group_code.sql

@@ -3,7 +3,8 @@ CREATE TABLE `resi_group_code` (
   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
   `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID',
   `GROUP_ID` varchar(64) NOT NULL COMMENT '小组Id',
-  `TYPE` varchar(32) NOT NULL COMMENT '二维码类型 邀请:invite',
+  `INVITATION_ID` varchar(64) NOT NULL COMMENT '邀请id',
+  `TYPE` varchar(32) NOT NULL COMMENT '微信二维码使用类型 邀请:invite',
   `URL` varchar(128) NOT NULL COMMENT '二维码路径',
   `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标志',
   `REVISION` int(11) NOT NULL COMMENT '乐观锁',
@@ -12,4 +13,4 @@ CREATE TABLE `resi_group_code` (
   `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
   PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='小组二维码 小组唯一二维码，海报码和小组码是同一个二维码，长期有效的';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='小组二维码 小组唯一二维码，海报码和小组码是同一个二维码，长期有效的';

epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.5__group_audit_switch.sql

@@ -1,8 +1,8 @@
-alter table resi_group add column AUDIT_SWITCH varchar(32) not null DEFAULT'open' COMMENT '进组审核open开启；close关闭';
-
-
-alter table group_invitation add column INVITATION_TYPE VARCHAR(32) NOT NULL DEFAULT 'invited' comment '邀请链接：invited;扫码：scancode';
+ALTER TABLE `resi_group`
+ADD COLUMN `AUDIT_SWITCH`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'open' COMMENT '进组审核open开启；close关闭' AFTER `LATEST_TOPIC_PUBLISH_DATE`;
 
+ALTER TABLE `group_invitation`
+ADD COLUMN `INVITATION_TYPE`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'link' COMMENT '邀请链接：invited;扫码：scancode' AFTER `RESI_GROUP_ID`;
 
 alter table group_memeber_operation MODIFY ENTER_GROUP_TYPE varchar(32) not null  comment '入群方式：（受邀请入群 - invited;主动加入 - join;created创建群自动进入;scancode扫码入群）';
 

epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.6__add_group_code_invitation_id.sql

@@ -1 +0,0 @@
-ALTER TABLE `resi_group_code` ADD INVITATION_ID varchar(64) NOT NULL COMMENT '邀请id';