Merge branch 'dev' into test

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserRespVO.java

@@ -58,6 +58,10 @@ public class UserRespVO{
     @DictFormat(DictTypeConstants.USER_SEX)
     private Integer sex;
 
+    @Schema(description = "用户来源，参见 UserSourceEnum 枚举类", example = "1")
+    @ExcelProperty("用户来源")
+    private Integer userSource;
+
     @Schema(description = "用户头像", example = "123456789")
     private String avatar;