Merge remote-tracking branch 'origin/dev-2.0.1' into dev-2.0.1

liujie

2025-05-20 39faeb972b20562bf2f0b7b8cc4474ea8a3998e1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActWorkGuideDTO.java

@@ -60,5 +60,8 @@
    @ApiModelProperty(value = "是否在线 （0 不在线   1在线）")
    private String isOnLine;

    @ApiModelProperty(value = "组件json数据")
    private String jsonObject;

    private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
}