Browse Source

20201124v1.3

tiaosheng
zy_Java 5 years ago
parent
commit
e5f5b6700e
  1. 2
      cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java
  2. 1
      mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java
  3. 2
      tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java
  4. 1
      tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
  5. 4
      tall/src/main/resources/application.yml

2
cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java

@ -51,5 +51,7 @@ public class MemberVo {
private Long memberId;
@ApiModelProperty("成员名")
private String memberName;
@ApiModelProperty("userId")
private Long userId;
}
}

1
mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java

@ -606,6 +606,7 @@ public class CompeteTaskService implements ICompeteTaskService {
MemberVo.MemberList memberList = memberListJsonResponse.getData();
if (ObjectUtil.isNotNull(memberList)) {
memberId = memberList.getMemberId();
userId = memberList.getUserId();
}
//将该成员添加至角色下

2
tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java

@ -367,6 +367,8 @@ public class ProjectVo {
private Long memberId;
@ApiModelProperty("成员名")
private String memberName;
@ApiModelProperty("userId")
private Long userId;
}

1
tall/src/main/java/com/ccsens/tall/service/ProMemberService.java

@ -457,6 +457,7 @@ public class ProMemberService implements IProMemberService {
member = new ProjectVo.MemberList();
member.setMemberId(memberList.get(0).getId());
member.setMemberName(memberList.get(0).getNickname());
member.setUserId(memberList.get(0).getUserId());
}
return member;
}

4
tall/src/main/resources/application.yml

@ -1,5 +1,5 @@
spring:
profiles:
active: dev
include: util-dev,common
active: test
include: util-test,common

Loading…
Cancel
Save