Merge branch 'zhaozhengjie1104' into test

101captain

2021-11-22 3c3010efa34de5e16f43ab03b5bb1dd84110f8f8

 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;
}