From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/business/model/WithdrawalOrders.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/WithdrawalOrders.java b/server/services/src/main/java/com/doumee/dao/business/model/WithdrawalOrders.java
index 61ea0e9..51edffa 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/WithdrawalOrders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/WithdrawalOrders.java
@@ -56,6 +56,11 @@
@ExcelColumn(name = "浼氬憳涓婚敭")
private Integer memberId;
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�1= 鍙告満锛�2=搴楅摵锛�", example = "1")
+ @ExcelColumn(name = "鐢ㄦ埛绫诲瀷锛�1= 鍙告満锛�2=搴楅摵锛�")
+ private Integer memberType;
+
+
@ApiModelProperty(value = "鎻愮幇閲戦(鍗曚綅:鍒�)")
@ExcelColumn(name = "鎻愮幇閲戦")
private Long amount;
@@ -88,6 +93,19 @@
@ExcelColumn(name = "鎻愮幇鐢宠鍗曞彿")
private String outBillNo;
+ @ApiModelProperty(value = "鏀粯瀹濇彁鐜拌处鎴�")
+ private String aliAccount;
+
+ @ApiModelProperty(value = "瀹℃壒鎿嶄綔浜猴紙鍏宠仈system_user锛�", example = "1")
+ private Integer userId;
+
+ @ApiModelProperty(value = "瀹℃壒鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date approveTime;
+
+ @ApiModelProperty(value = "瀹℃壒澶囨敞")
+ private String approveRemark;
+
@TableField(exist = false)
@ApiModelProperty(value = "鍒涘缓寮�濮嬫椂闂�(鏌ヨ鐢�)", example = "2026-01-01")
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -98,4 +116,29 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createEndTime;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀹℃壒浜哄悕绉�")
+ private String updateUserName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍙告満濮撳悕")
+ private String memberName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍙告満鑱旂郴鐢佃瘽")
+ private String memberTelephone;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "闂ㄥ簵鍚嶇О")
+ private String shopName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鑱旂郴浜�")
+ private String linkName;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "闂ㄥ簵璇︽儏")
+ private ShopInfo shopInfo;
+
}
--
Gitblit v1.9.3