Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/organization/entity/User.java

@@ -45,7 +45,7 @@ public class User extends AuditEntity implements Serializable {
     private String password;
 
     @ApiModelProperty("性别")
-    private Integer gender;
+    private String gender;
 
     @ApiModelProperty("手机号")
     private String mobile;