From 72396cbbb60d0418dd4cb63f310532fc70a28c10 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 17:59:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/dto/UpdateSetOrderDoneDto.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/UpdateSetOrderDoneDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/UpdateSetOrderDoneDto.java
index e3f1ca6..dd4c723 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/UpdateSetOrderDoneDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/UpdateSetOrderDoneDto.java
@@ -13,5 +13,20 @@
 	
 	@ApiModelProperty(value ="需要处理的IDs（字符串逗号隔开）")
 	private String orderIds;
+	
+	@ApiModelProperty(value ="结算方式1，线下结算，2余额结算")
+	private Integer setType;
+	
+	@ApiModelProperty(value ="结算人数")
+	private Integer  manCount;
+	
+	@ApiModelProperty(value ="结算单数")
+	private Integer  orderCount;
+	
+	@ApiModelProperty(value ="结算金额")
+	private Double  amount;
+	
+	@ApiModelProperty(value ="备注")
+	private String  remark;
 
 }

--
Gitblit v1.9.1