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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -33,4 +33,13 @@
     * 用户Id
     */
    private Long userId;

    /**
     * 选项类型 0 固定选项 1 自定义选项
     */
    private Integer type;
    /**
     *
     */
    private Long selectionId;
}