Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-27 e95b39d335a224617621de3fd5d645fd2f47338f

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideClassifyDO.java

@@ -24,7 +24,7 @@
    /**
    * 自增id
    */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**