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

@@ -1,11 +1,12 @@
package com.panzhihua.service_community.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;

/**
 * @Author: llming
@@ -15,7 +16,7 @@
@TableName(value = "com_act_questnaire_answer_content")
public class ComActQuestnaireAnswerContentDO extends BaseDO implements Serializable {
    private static final long serialVersionUID = 7648337436253280726L;
    @TableId(type= IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 问卷回答选项
@@ -39,7 +40,7 @@
     */
    private Integer type;
    /**
     *  题目选项id
     * 题目选项id
     */
    private Long selectionId;
}