Merge branch 'master' of git-server.lierdapark.com:JasonGroup/challenger-rmi

.gitignore

@@ -11,3 +11,4 @@ out
 gen
 /bin/
 .classpath
+*.prefs

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserBaseHystrix.java

@@ -19,11 +19,11 @@ public abstract class EllaUserBaseHystrix implements EllaUserBaseRemoteService {
 
 	public abstract Message adminPage(@RequestBody EllaUserBaseVo vo);
 
-	public abstract Message userToAdd();
+	public abstract Message userBaseToAdd();
 
-	public abstract Message userToUpdate(@PathVariable Integer userId);
+	public abstract Message userBaseToUpdate(@PathVariable Integer userId);
 
-	public abstract Message userDoAddOrUpdate(@RequestBody EllaUserBaseVo vo);
+	public abstract Message userBaseDoAddOrUpdate(@RequestBody EllaUserBaseVo vo);
 
 	public abstract Message douploadfiles(MultipartFile file);
 

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserBaseRemoteService.java

@@ -30,15 +30,15 @@ public interface EllaUserBaseRemoteService {
 
 	@ApiOperation(value = "点击添加，返回用户类型，角色列表及组织架构信息")
 	@RequestMapping(value = "/challenger/user/toAdd", method = RequestMethod.GET)
-	Message userToAdd();
+	Message userBaseToAdd();
 
 	@ApiOperation(value = "编辑，根据用户id返回用户信息")
 	@RequestMapping(value = "/challenger/user/toUpdate/{userId}", method = RequestMethod.GET)
-	Message userToUpdate(@PathVariable Integer userId);
+	Message userBaseToUpdate(@PathVariable Integer userId);
 
 	@ApiOperation(value = "用户存储或更新操作")
 	@RequestMapping(value = "/challenger/user/doAddOrUpdate", method = RequestMethod.POST)
-	Message userDoAddOrUpdate(@RequestBody EllaUserBaseVo vo);
+	Message userBaseDoAddOrUpdate(@RequestBody EllaUserBaseVo vo);
 
 	@ApiOperation(value = "文件上传")
 	@RequestMapping(value = "/challenger/file/upload", method = RequestMethod.POST)

src/main/java/com/senthink/rmi/challenger/vo/EllaUserBaseVo.java

@@ -162,6 +162,15 @@ public class EllaUserBaseVo extends PageVo {
 	@ApiModelProperty("拒绝时间")
 	private String rejectTime;
 
+	private String vcuNo;
+	
+	public String getVcuNo() {
+		return vcuNo;
+	}
+	public void setVcuNo(String vcuNo) {
+		this.vcuNo = vcuNo;
+	}
+	
 	public String getName() {
 		return name;
 	}