From 7ff92e90d2318f5c2597c4ba01e0cbfde983cec0 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 六月 2026 10:13:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectricalCharge.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectricalCharge.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectricalCharge.java
index f50a488..7970889 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectricalCharge.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectricalCharge.java
@@ -65,6 +65,8 @@
@ApiModelProperty("瀹㈡埛涓婚敭锛堝叧鑱攜w_customer)")
@ExcelColumn(name="瀹㈡埛涓婚敭锛堝叧鑱攜w_customer)",index=14 ,width=10)
private Integer customerId;
+ @ApiModelProperty("寰俊鏀粯璁㈠崟鍙�")
+ private String wxOrderNo;
@ApiModelProperty("鍏ヨ处鏃ユ湡")
@ExcelColumn(name="鍏ヨ处鏃ユ湡",index=15 ,width=10)
private Date incomeTime;
@@ -98,8 +100,14 @@
@ApiModelProperty("鍏呭�煎墠璐﹀彿浣欓锛堝厓锛�")
@ExcelColumn(name="鍏呭�煎墠璐﹀彿浣欓锛堝厓锛�",index=25 ,width=10)
private BigDecimal banlance;
+ @ApiModelProperty("鍏呭�煎悗浣欓锛堝厓锛�")
+ @ExcelColumn(name="鍏呭�煎悗浣欓锛堝厓锛�",index=26 ,width=10)
+ private BigDecimal balanceAfter;
+ @ApiModelProperty("璁惧灞曠ず淇℃伅")
+ @ExcelColumn(name="璁惧灞曠ず淇℃伅",index=27 ,width=10)
+ private String deviceInfo;
@ApiModelProperty("閫夋嫨鐢佃〃鍙傛暟鐩存帴锛坹w_electrical_param)")
- @ExcelColumn(name="閫夋嫨鐢佃〃鍙傛暟鐩存帴锛坹w_electrical_param)",index=26 ,width=10)
+ @ExcelColumn(name="閫夋嫨鐢佃〃鍙傛暟鐩存帴锛坹w_electrical_param)",index=28 ,width=10)
private Integer paramId;
@TableField(exist = false)
--
Gitblit v1.9.3