From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001 From: luoxinwu <934743099@qq.com> Date: 星期二, 05 三月 2024 09:42:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java index 7dca617..ae7dd15 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java @@ -34,7 +34,7 @@ private String content; @ApiModelProperty("所属分类") - private Integer classify; + private String classify; @ApiModelProperty("所属分类名称") private String classifyName; @@ -59,5 +59,11 @@ private String areaCode; + @ApiModelProperty(value = "组件json数据") + private String jsonObject; + + @ApiModelProperty(value = "是否在线 (0 不在线 1在线)") + private String isOnLine; + private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList(); } -- Gitblit v1.7.1