From 40c6bb2a4e15f3c2a5a72f3842404b49a25d4be8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 四月 2021 10:47:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java |    2 --
 1 files changed, 0 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..ddf852e 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,8 +14,6 @@
 @Data
 @ApiModel("订单发货信息")
 public class ComShopOrderShipDTO {
-    @ApiModelProperty(value = "订单号")
-    private String orderNo;
     @ApiModelProperty(value = "ID")
     private Long orderId;
     @ApiModelProperty(value = "物流公司")

--
Gitblit v1.7.1