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

lidongdong

2022-11-10 8e925f5deae670edf6c62fe6e13ade401cadb564

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java

@@ -70,6 +70,7 @@
    * 工作时间
    * */
    private String workTime;
    private String logo;


    private static final long serialVersionUID = 1L;