From a9fac3d1e2fdba55d61196cc14377c48c66e6daf Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 27 四月 2021 10:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java
index cdadca4..ade3414 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java
@@ -15,10 +15,12 @@
  * @Version 1.0
  **/
 @Data
-@ApiModel("订单发货信息")
+@ApiModel("订单配送信息")
 public class ComShopOrderDeliverDTO {
-    @ApiModelProperty(value = "订单号")
-    private String orderNo;
     @ApiModelProperty(value = "订单ID")
     private Long orderId;
+    @ApiModelProperty(value = "操作账号", hidden = true)
+    private String operUserAccount;
+    @ApiModelProperty(value = "是否是管理员", hidden = true)
+    private Boolean isAdmin = false;
 }

--
Gitblit v1.7.1