Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-11-17 56e2dc02ca5f4cf38308f8a1389322639f89e99e

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

@@ -70,6 +70,7 @@
    private Date updateBy;

    private String workTime;
    private String logo;

    private static final long serialVersionUID = 1L;
}