From 25ef334e692ff6a3119fb906b08f2869649cd1c7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 18:10:12 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/dao/business/model/Orders.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
index 67d9c3f..71b0ec2 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
@@ -102,8 +102,10 @@
     @ApiModelProperty(value = "棰勪及璐圭敤", example = "1")
     private Long estimatedAccount;
 
+
     @ApiModelProperty(value = "瀹為檯鏀粯璐圭敤", example = "1")
     private Long payAccount;
+
 
     @ApiModelProperty(value = "瀹炴敹璐圭敤", example = "1")
     private Long receiveAccount;
@@ -151,6 +153,7 @@
     private Integer acceptMemberId;
 
     @ApiModelProperty(value = "鎺ュ崟绫诲瀷:0=鎵嬪姩鎺ュ崟锛�1=绯荤粺娲惧崟锛�", example = "1")
+    @ExcelColumn(name = "鎺ュ崟鏂瑰紡",index = 14,width = 10,valueMapping = "0=鎵嬪姩鎺ュ崟;1=绯荤粺娲惧崟;")
     private Integer acceptType;
 
     @ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
@@ -187,6 +190,9 @@
     @ApiModelProperty(value = "鏄惁宸蹭慨鏀�:0=鍚︼紱1=鏄紱2=宸茬‘璁�;", example = "1")
     private Integer isUpdate;
 
+    @ApiModelProperty(value = "淇敼鏃堕棿", example = "1")
+    private Integer isUpdateTime;
+
     @ApiModelProperty(value = "鎺ュ崟鏂归粦鍚嶅崟member:id 澶氫釜浠�,鍒嗗壊")
     private String blackReceive;
 
@@ -206,6 +212,9 @@
     @TableField(exist = false)
     private List<OrderLog> orderLogList;
 
+    @ApiModelProperty(value = "璁㈠崟鐘舵�佹弿杩�", example = "1")
+    @TableField(exist = false)
+    private String statusName;
 
 
     @ApiModelProperty(value = "閫旂粡鐐�")
@@ -282,6 +291,15 @@
     private Date acceptTimeEnd;
 
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    @ExcelColumn(name = "棰勪及閲戦锛堝厓锛�",index = 12,width = 10)
+    private double estimatedAccountYuan;
+
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    @ExcelColumn(name = "瀹炰粯閲戦锛堝厓锛�",index = 13,width = 10)
+    private double payAccountYuan;
 
     @ApiModelProperty(value = "瀹屾垚鏃堕棿璧�")
     @TableField(exist = false)

--
Gitblit v1.9.3