Merge branch 'master' of http://app.tjzhxx.cn:3001/chaos/yyky_vue

ruoyi-system/src/main/java/com/ruoyi/system/domain/TUserProfile.java

@@ -32,7 +32,7 @@ public class TUserProfile extends BaseEntity {
     /**
      * 性别
      */
-    @Excel(name = "性别", comboDictType = "sys_user_sex")
+    @Excel(name = "性别", comboDictType = "sys_user_sex", readConverterExp = "0=男,1=女,2=未知")
     private Integer gender;
 
     /**