Merge remote-tracking branch 'origin/master'

tangzy

2021-09-03 82c1565bfb427ed2658b9790544bca258f784100

 src/main/java/org/springblade/modules/system/vo/UserVO.java

@@ -89,4 +89,9 @@
    * 排序
    */
   private String sort;

   /**
    * 排序
    */
   private Integer age;
}