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

张天森

2022-11-10 4c0f9a7eb32a1a449fa472a01d9284642f19cc25

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

@@ -40,12 +40,12 @@
    /**
     * 是否删除0否1是
     */
    private Boolean delFlag;
    private Integer delFlag;

    /**
     * 状态0可用1禁用
     */
    private Boolean status;
    private Integer status;

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


    private static final long serialVersionUID = 1L;