From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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..a5cf949 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
@@ -3,9 +3,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.NonNull;
-
-import javax.validation.constraints.Min;
/**
* @ClasssName OrderShipDTO
@@ -15,10 +12,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