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

张天森

2022-10-17 f9a09c38219b9dacecaeef041a84ed647fa0290d

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java

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

    /**