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

@@ -26,11 +26,18 @@
     */
    private Integer sort;
    /**
     * 选项名
     */
    private String optionName;
    /**
     * 选项内容
     */
    private String content;

    /**
     * 选项名
     */
    private String optionName;

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

}