Merge remote-tracking branch 'origin/lyq_battery_shop' into diandongche

101captain

2022-08-15 bfbfe7d5fd6c90d5f7359762223ce4bd1cc7cfa1

 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;

    /**