Merge branch 'test' into 'test_bak'

罗元桥

2021-10-12 61e898a41843a61f2314efcb1b874ac3c2073bad

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