diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java
index 25563956d..79f669d2b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java
@@ -2,7 +2,7 @@
* @Project: emis
* @Title: EmisSiteSettleRecord.java
* @author linfso
- * @date 2024-06-15 07:21:29
+ * @date 2024-06-15 11:07:03
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description:
网点账户结算记录 实体类
@@ -26,7 +26,7 @@ import lombok.Data;
* @ClassName EmisSiteSettleRecord
* @Description 网点账户结算记录
* @author linfso
- * @date 2024-06-15 07:21:29
+ * @date 2024-06-15 11:07:03
*/
@Data
public class EmisSiteSettleRecord extends BaseEntity
@@ -39,10 +39,12 @@ public class EmisSiteSettleRecord extends BaseEntity
private String accCode;
/* 运单号 */
private String billCode;
- /* 收支类型:应收 应付 */
+ /* 结算类型:应收 应付 */
private String recPayType;
/* 结算类型: 充值等 */
private String settleType;
+ /* 结算类型名称 */
+ private String settleName;
/* 前余额 */
private BigDecimal preBalance;
/* 前确认余额 */
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml
index 737bfbaec..95f1b693d 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml
@@ -4,12 +4,13 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
+
@@ -43,7 +44,7 @@
- select id, acc_code, bill_code, rec_pay_type, settle_type, pre_balance, pre_confirm_balance, cur_money, cur_confirm_money, back_balance, back_confirm_balance, currency, change_type, change_date, center_code, site_code, source_type, finance_date, operata_date, bl_confirm, confirm_man_code, confirm_site_code, settle_man_code, settle_site_code, bl_center, center_man_code, bl_site, site_man_code, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, center_date, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site_settle_record
+ select id, acc_code, bill_code, rec_pay_type, settle_type, settle_name, pre_balance, pre_confirm_balance, cur_money, cur_confirm_money, back_balance, back_confirm_balance, currency, change_type, change_date, center_code, site_code, source_type, finance_date, operata_date, bl_confirm, confirm_man_code, confirm_site_code, settle_man_code, settle_site_code, bl_center, center_man_code, bl_site, site_man_code, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, center_date, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site_settle_record
@@ -160,6 +163,7 @@
bill_code,
rec_pay_type,
settle_type,
+ settle_name,
pre_balance,
pre_confirm_balance,
cur_money,
@@ -205,6 +209,7 @@
#{billCode},
#{recPayType},
#{settleType},
+ #{settleName},
#{preBalance},
#{preConfirmBalance},
#{curMoney},
@@ -253,6 +258,7 @@
bill_code = #{billCode},
rec_pay_type = #{recPayType},
settle_type = #{settleType},
+ settle_name = #{settleName},
pre_balance = #{preBalance},
pre_confirm_balance = #{preConfirmBalance},
cur_money = #{curMoney},