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

huanghongfa

2021-08-04 25b3f5f6478bae1c0c063cb5a9e47b3eef5d0052

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

@@ -30,7 +30,7 @@
    /**
     * 投票人id
     */
    private String userId;
    private Long userId;

    /**
     * 投票时间