Merge remote-tracking branch 'origin/master'

tangzy

2021-08-25 12fd820acec998c56b928907b92beca32e6ae90b

 src/main/java/org/springblade/modules/system/mapper/UserMapper.java

@@ -129,4 +129,6 @@
    * @return
    */
   UserVO getUserAgeById(@Param("userId") Long userId);

   List<Map<String, Object>> selectUser();
}