Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-09 91a2f11b8b74aa170abc32d2b5d9603b279c094d

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

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

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

}