Merge branch 'test_wangge_two' into 'test'

罗元桥

2021-06-23 2b322522e7b801377cdba46c66a1c4ae61f56be0

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

@@ -31,7 +31,7 @@
    /**
     * 用户主键
     */
    private Long user;
    private Long userId;

    /**
     * 点赞时间