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

manailin

2021-10-08 84fae9aed66f2841b58b2ef66ff7c11cd0dbaacd

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