Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-18 0e7584f11e1da29ce07f5f21048197dd155f1574

 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;
}