Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-08 1f4b6a01c2b2c710b49873430df164ad2da48f1d

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

@@ -173,5 +173,5 @@
   @TableField(exist = false)
   private String keyword;
   @TableField(exist = false)
   private String userType;
   private Integer userType;
}