From 35de4ec51dc2bb3c1ae73fb8a66f10d53a4b1a0d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 四月 2021 15:20:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderQueryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderQueryDTO.java
index bc1f5b0..503f18a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderQueryDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderQueryDTO.java
@@ -18,4 +18,10 @@
 
     @ApiModelProperty(value = "手机号",hidden = true)
     private String phone;
+
+    @ApiModelProperty(value = "操作账号", hidden = true)
+    private String operUserAccount;
+
+    @ApiModelProperty(value = "是否是管理员", hidden = true)
+    private Boolean isAdmin = false;
 }

--
Gitblit v1.7.1