Merge branch 'test' into 'master'

罗元桥

2021-08-05 cc1098fc00a50cb1591d182f04bc37066ff0a9e2

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

@@ -5,19 +5,22 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;

/**
 * @Author: llming
 * @Description: 问卷题目
 */
@Data
@TableName(value = "com_act_questnaire_sub")
public class ComActQuestnaireSubDO extends BaseDO {
public class ComActQuestnaireSubDO extends BaseDO implements Serializable {
    private static final long serialVersionUID = 914683789736719693L;
    @TableId(type= IdType.AUTO)
    private Long id;
    /**
     * 类型 0单选1多选2问答题
     */
    private Integer type;
    private int type;
    /**
     * 题目内容
     */
@@ -25,7 +28,7 @@
    /**
     * 序号
     */
    private Integer sort;
    private int sort;
    /**
     * 调查问卷Id
     */