!6 同步develop分支

* sync -- 同步develop分支

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

@@ -18,12 +18,12 @@ import lombok.experimental.Accessors;
 @TableName("test_demo")
 public class TestDemo extends BaseEntity {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
 
-	/**
-	 * 主键
-	 */
+    /**
+     * 主键
+     */
     @TableId(value = "id")
     private Long id;
 
@@ -40,7 +40,7 @@ public class TestDemo extends BaseEntity {
     /**
      * 排序号
      */
-	@OrderBy(asc = false, sort = 1)
+    @OrderBy(asc = false, sort = 1)
     private Long orderNum;
 
     /**