From b50e57bf7e17d696ddb4e9785c909052da034ef4 Mon Sep 17 00:00:00 2001 From: longz <longzhaoz@qq.com> Date: 星期二, 14 七月 2026 09:10:47 +0800 Subject: [PATCH] Merge branch '2.1' into 2.3 --- sql/charging_pile_service.sql | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/sql/charging_pile_service.sql b/sql/charging_pile_service.sql index 6381502..fae42cf 100644 --- a/sql/charging_pile_service.sql +++ b/sql/charging_pile_service.sql @@ -1897,6 +1897,12 @@ `role_id` int NULL DEFAULT NULL COMMENT '角色id', `logo_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT 'logo地址', `rate` double(10, 2) NULL DEFAULT NULL COMMENT '费率', + `icbc_partner_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '工行合作商ID', + `icbc_sub_mer_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '工行二级商户编号', + `icbc_sub_mer_prtcl_no` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '工行二级商户协议编号', + `icbc_mer_acct` varchar(34) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '工行直接分账商户清算账号', + `electricity_share_ratio` decimal(5, 2) NULL DEFAULT NULL COMMENT '电费分成比例', + `service_share_ratio` decimal(5, 2) NULL DEFAULT NULL COMMENT '服务费分成比例', `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '注册地址', `phone_one` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '合作商电话1', `phone_two` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '合作商电话2', -- Gitblit v1.7.1