From 08eefab8f0b04018dc62928ec2191bcae9d3e7d0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 15 十月 2021 16:25:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 5ef04a2..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
@@ -14,12 +14,14 @@
@Data
@ApiModel("订单发货信息")
public class ComShopOrderShipDTO {
- @ApiModelProperty(value = "订单号")
- private String orderNo;
@ApiModelProperty(value = "ID")
private Long orderId;
@ApiModelProperty(value = "物流公司")
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