Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus

疯狂的狮子li

2021-06-24 24c7ff79595c12d6bd84285236b888c3eb2f71e5

 ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java

@@ -69,7 +69,6 @@
    private String updateBy;

    /** 删除标志 */
    @TableLogic
    private Long delFlag;

}