Merge branch 'zhaozhengjie1104' into test

101captain

2021-11-19 216dd040d86f9aadd84a8feadd5f85e112b40983

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

@@ -37,4 +37,9 @@
     * 投票时间
     */
    private Date createAt;

    /**
     * 一起议id
     */
    private Long discussId;
}