Merge remote-tracking branch 'origin/master'

huliguo

昨天 23ac3e4f8fb16db0759ba5c91c4d06d622c67009

 src/main/java/com/linghu/model/entity/KeywordTask.java

@@ -30,6 +30,7 @@
     */
    private String task_id;
    private String status;
    private Integer num;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;