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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbOrgDO.java

@@ -1,11 +1,12 @@
package com.panzhihua.service_dangjian.model.dos;

import java.io.Serializable;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -20,7 +21,7 @@
    /**
     * 党组织id
     */
    @TableId(type= IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /**