From 4e214289ec907ecb1d14de3e6fcd17b4582257f0 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 12 Jul 2021 19:17:02 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java
index b397718..b0e5aef 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java
@@ -16,6 +16,8 @@
 	private Long id;
 	@ApiModelProperty(value = "订单编号")
 	private String orderNo;
+	@ApiModelProperty(value = "订单状态")
+	private Integer orderState;
 	@ApiModelProperty(value = "实付金额（元）")
 	private BigDecimal actualBalance;
 	@ApiModelProperty(value = "下单门店")

--
Gitblit v1.9.1