From cd83aadb07d8e1cea473a491066a6c6b0298ce2f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 09 十一月 2021 10:36:52 +0800
Subject: [PATCH] Merge branch 'zhaozhengjie1104' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java
index ddf852e..a2bb2d3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java
@@ -20,4 +20,8 @@
     private String logisticsCompany;
     @ApiModelProperty(value = "物流单号")
     private String logisticsNo;
+    @ApiModelProperty(value = "操作账号", hidden = true)
+    private String operUserAccount;
+    @ApiModelProperty(value = "是否是管理员", hidden = true)
+    private Boolean isAdmin;
 }

--
Gitblit v1.7.1