From 17a07481c3292e6fcbc7fff3dcbeb8ae817c178c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Jul 2021 16:16:24 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
index c0d4796..360127a 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
@@ -33,7 +33,7 @@
private String reserveTime;
@ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
- private String status;
+ private Integer status;
@ApiModelProperty(value="集物员")
private String username;
@@ -48,12 +48,12 @@
private String remark;
@ApiModelProperty(value="评论")
- private String comment;
+ private String comments;
@ApiModelProperty(value="得分 0-0分1-20分2-40分3-60分4-80分5-100分")
- private String score;
+ private Integer score;
@ApiModelProperty(value="是否匿名 1-是2-否")
private String isAnonymous;
- private List<JhyOrderItems> JhyOrderItems;
+ private List<JhyOrderItemsVo> JhyOrderItems;
}
--
Gitblit v1.9.1