Merge remote-tracking branch 'origin/bonus-houqin' into bonus-houqin

sql/bns_houqin_202502_patch/20250216_alloc_area_move_to_alloc_area.sql

@@ -1,4 +0,0 @@
--- 将顶级的 area 的父节点，设为公司 id
-update alloc_area set super_id = 378915985597403136
-where area_id = 378916722880548864;
-

sql/bns_houqin_202502_patch/20250216_cust_info_move_to_sys_user.sql

@@ -1,12 +1,11 @@
 alter table sys_user add  `cust_id` bigint(20) NOT NULL COMMENT '人员id';
 alter table sys_user add  `cust_num` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '人员编号';
 alter table sys_user add  `psn_type` int(11) DEFAULT NULL COMMENT '人员类别';
-alter table sys_user add  `psn_type_name` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '人员类别名称';
 alter table sys_user add  `area_id` bigint(20) DEFAULT NULL COMMENT '区域id';
 
 select cust_id as user_id, cust_id as user_name, cust_id,cust_num,org_id as dept_id,cust_name as nick_name,
        cust_photo_url as avatar,
-       mobile as phonenumber,pwd as password,sex-1 as sex,psn_type,psn_type_name,'1' as is_customer,
+       mobile as phonenumber,pwd as password,sex-1 as sex,psn_type,psn_type_name,'2' as login_type,
        crby as create_by,crtime as create_time,
        upby as update_by,uptime as update_time
 from cust_info

sql/bns_houqin_202502_patch/20250216_mgr_role_move_to_sys_role.sql

@@ -1,4 +1,4 @@
-alter table sys_role add `role_type` int(11) DEFAULT NULL COMMENT '角色类型';
+alter table sys_role add `role_type` int(11) DEFAULT NULL COMMENT '角色类型(1-全数据类,2-组织类,3-商户类)';
 alter table sys_role add `area_id` bigint(20) DEFAULT NULL COMMENT '区域id';
 
 SELECT role_id,role_name,role_code as role_key,role_type,area_id,99 as role_sort,0 as status,