Merge branch 'master' into test

CeDo

2021-06-08 fc855f524ba0c8dc3222da76d28b38afbac69fe0

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

@@ -13,7 +13,7 @@
 * @create: 2021-01-22 15:09
 **/
@Data
@TableName(value = "com_act_discuss")
@TableName(value = "com_act_discuss_comment")
public class ComActDiscussCommentDO implements Serializable {
    private static final long serialVersionUID = 1L;