From f6f928d81ad53f424f35a9149db11b301ed7f8a8 Mon Sep 17 00:00:00 2001
From: LuoTong <2232327099qq.com>
Date: 星期一, 22 四月 2024 16:25:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActWorkGuideDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActWorkGuideDTO.java
index 97a4ee9..e08f2bd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActWorkGuideDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActWorkGuideDTO.java
@@ -57,5 +57,11 @@
 
     private String areaCode;
 
+    @ApiModelProperty(value = "是否在线 (0 不在线   1在线)")
+    private String isOnLine;
+
+    @ApiModelProperty(value = "组件json数据")
+    private String jsonObject;
+
     private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
 }

--
Gitblit v1.7.1