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

CeDo

2021-05-20 5ade6f6e4532b65b96d80eabe5d92302f6f817f4

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

@@ -38,4 +38,8 @@
     * 选项类型 0 固定选项 1 自定义选项
     */
    private Integer type;
    /**
     *
     */
    private Long selectionId;
}