From af73409f431fb97eade82d34eff8c7b05e7fac92 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 10 六月 2021 14:47:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_elder_cedoo' into test_elder_cedoo

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java
index cc0b5d8..ac068ce 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java
@@ -19,5 +19,5 @@
     private Long id;
 
     @ApiModelProperty("广告位置中文描述")
-    private String desc;
+    private String advDesc;
 }

--
Gitblit v1.7.1