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
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Partner.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Partner.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Partner.java
index c6c2ea0..2411274 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Partner.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Partner.java
@@ -75,6 +75,24 @@
@ApiModelProperty(value = "工行合作商ID")
private String icbcPartnerId;
/**
+ * 工行二级商户编号
+ */
+ @TableField("icbc_sub_mer_id")
+ @ApiModelProperty(value = "工行二级商户编号")
+ private String icbcSubMerId;
+ /**
+ * 工行二级商户协议编号
+ */
+ @TableField("icbc_sub_mer_prtcl_no")
+ @ApiModelProperty(value = "工行二级商户协议编号")
+ private String icbcSubMerPrtclNo;
+ /**
+ * 工行直接分账商户清算账号
+ */
+ @TableField("icbc_mer_acct")
+ @ApiModelProperty(value = "工行直接分账商户清算账号")
+ private String icbcMerAcct;
+ /**
* 电费分成比例
*/
@TableField("electricity_share_ratio")
--
Gitblit v1.7.1