diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/SettleOrderReport.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/SettleOrderReport.java
index 0ef18eaa9..380e8a8f7 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/SettleOrderReport.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/SettleOrderReport.java
@@ -96,8 +96,7 @@ public class SettleOrderReport extends BaseEntity {
/**
* 删除标识(0-正常;1-删除)
*/
- @Excel(name = "删除标识", readConverterExp = "0=-正常;1-删除")
- private String delFalg;
+ private String delFlag;
public void setId(Long id) {
this.id = id;
@@ -203,12 +202,12 @@ public class SettleOrderReport extends BaseEntity {
return tradeFee;
}
- public void setDelFalg(String delFalg) {
- this.delFalg = delFalg;
+ public void setDelFlag(String delFlag) {
+ this.delFlag = delFlag;
}
- public String getDelFalg() {
- return delFalg;
+ public String getDelFlag() {
+ return delFlag;
}
@Override
@@ -228,7 +227,7 @@ public class SettleOrderReport extends BaseEntity {
.append("tradeAmount", getTradeAmount())
.append("tradeFee", getTradeFee())
.append("createTime", getCreateTime())
- .append("delFalg", getDelFalg())
+ .append("delFlag", getDelFlag())
.toString();
}
}
diff --git a/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
index d54fac01b..ee6ccc9bd 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
@@ -19,11 +19,11 @@
-
+
- select id, merchant_id, station_id, use_electricity, charge_num, charge_time, electricity_amount, service_amount, total_amount, virtual_amount, trade_date, trade_amount, trade_fee, create_time, del_falg from settle_order_report
+ select id, merchant_id, station_id, use_electricity, charge_num, charge_time, electricity_amount, service_amount, total_amount, virtual_amount, trade_date, trade_amount, trade_fee, create_time, del_flag from settle_order_report
@@ -67,7 +66,7 @@
trade_amount,
trade_fee,
create_time,
- del_falg,
+ del_flag,
#{id},
@@ -84,7 +83,7 @@
#{tradeAmount},
#{tradeFee},
#{createTime},
- #{delFalg},
+ #{delFlag},
@@ -104,7 +103,7 @@
trade_amount = #{tradeAmount},
trade_fee = #{tradeFee},
create_time = #{createTime},
- del_falg = #{delFalg},
+ del_flag = #{delFlag},
where id = #{id}