You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
sunyuchao
97f449250f
Merge branch 'dev_group_code' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
5 years ago |
| .. |
|
comment
|
新增resi-group,resi-partymember
|
6 years ago |
|
group
|
Merge branch 'dev_group_code' into dev
|
5 years ago |
|
invitation
|
根据链接查询群组信息接口修改记录用户邀请关系
|
6 years ago |
|
member
|
查看入群待审核列表SQL修改
|
5 years ago |
|
topic
|
Merge branch 'dev_issue_audit' into dev
|
5 years ago |