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/ComActWorkGuideDO.java

@@ -1,14 +1,13 @@
package com.panzhihua.service_community.model.dos;

import java.io.Serializable;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

/**
 * @auther llming
@@ -17,7 +16,7 @@
@Data
@TableName(value = "com_act_work_guide")
public class ComActWorkGuideDO extends BaseDO implements Serializable {
    /**自增 id*/
    /** 自增 id */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**