Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/model/vo/UserVO.java

@@ -17,7 +17,7 @@ import lombok.*;
 @ApiModel
 public class UserVO {
     @ApiModelProperty(name = "id",value = "用户的Id")
-    private String id;
+    private Integer id;
     @ApiModelProperty(name = "name",value = "用户姓名")
     private String name;
     @ApiModelProperty(name = "account",value = "账号")