Merge remote-tracking branch 'origin/dev'

疯狂的狮子li

2021-06-23 c12dc71ecea33d5c23e2ceb32bfc3db68e4198e3

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

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

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

}