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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,10 +1,11 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

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

    /**