zxc
|
9922ea4d4c
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
4 years ago |
sunyuchao
|
ccee1a6ac9
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
4 years ago |
|
sunyuchao
|
eb01bb1947
|
屏蔽话题列表查询接口按组类型返人名名称
|
4 years ago |
|
zxc
|
ee4a8d7570
|
入组审核列表 姓名修改
|
4 years ago |
jianjun
|
e87b4d33e8
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
4 years ago |
|
jianjun
|
2dc1fd1d4b
|
日志优化
|
4 years ago |
|
zxc
|
053aa50cbe
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
|
4 years ago |
|
zxc
|
85845728c2
|
小组成员查询姓名变动
|
4 years ago |
|
sunyuchao
|
2219406d36
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
4 years ago |
|
sunyuchao
|
7c5a12c19f
|
代码微调
|
4 years ago |
|
zxc
|
ec39dc6d75
|
处理 用户头像和姓名 提成方法
|
4 years ago |
|
jianjun
|
e6d8be6272
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
4 years ago |
|
jianjun
|
371b58def2
|
删除多余配置
|
4 years ago |
|
zxc
|
bf889acc21
|
处理 用户头像和姓名 提成方法
|
4 years ago |
|
zxc
|
615228623d
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
4 years ago |
|
zxc
|
33327a2241
|
showName修改
|
4 years ago |
|
sunyuchao
|
a34374d01d
|
组管理界面-待审核/已驳回列表接口按组类型返人名
|
4 years ago |
|
jianjun
|
fe4de141e9
|
Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
3d46bba9a0
|
增强程序健壮性
|
4 years ago |
|
jianjun
|
2b7146ffb4
|
Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
6ee247dfc0
|
组内成员加入时间错误
|
4 years ago |
|
sunyuchao
|
49867cec12
|
可胜任组长-组员列表(工作端通用)接口按组类型返人名
|
4 years ago |
|
jianjun
|
5572f690c9
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
4 years ago |
|
jianjun
|
836c86ca04
|
路由错误
|
4 years ago |
|
jianjun
|
d15d60612c
|
Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
Conflicts:
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
|
4 years ago |
|
jianjun
|
d3b5580aa4
|
设置转议题的时间
|
4 years ago |
|
sunyuchao
|
95f9cd8d2f
|
wxcode获取基本信息加点日志
|
4 years ago |
|
jianjun
|
08925151b9
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
4 years ago |
|
jianjun
|
a101855d1f
|
发送消息
|
4 years ago |
|
jianjun
|
e8466901a3
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
4 years ago |
|
jianjun
|
5c8f450061
|
代码暂存-更新到达时间 是否有误？
|
4 years ago |
|
jianjun
|
3ce033c1d0
|
代码暂存
|
4 years ago |
zhaoqifeng
|
4699fcb7f3
|
Merge branch 'dev_group_point' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
2e2080a9ec
|
未完成成就排序
|
4 years ago |
|
jianjun
|
f7f2065f35
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
4 years ago |
|
jianjun
|
b373e0ccec
|
代码前一
|
4 years ago |
|
jianjun
|
b14d926fa2
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
4 years ago |
|
jianjun
|
383b340871
|
小组成就规则
|
4 years ago |
|
zhaoqifeng
|
b64ea427ba
|
Merge branch 'dev_group_point' into dev_temp
|
4 years ago |
|
jianjun
|
7d51109b9f
|
小组成就排序
|
4 years ago |
yinzuomei
|
e74f2d86dd
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
712c36ed30
|
删除InvitationAccessRecordEntity,InvitationAccessRecordDTO,InvitationAccessRecordDao,InvitationAccessRecordDao.xml
|
4 years ago |
|
jianjun
|
3ebd113763
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
4 years ago |
|
jianjun
|
0ef1c129d5
|
Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
b550aee00b
|
话题转议题
|
4 years ago |
|
yinzuomei
|
0175a73f62
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
0675e15295
|
删除16，提交19
|
4 years ago |
|
yinzuomei
|
3a13f81693
|
invitation_record
|
4 years ago |
|
jianjun
|
f9ba77fa73
|
放错位置了
|
4 years ago |
|
jianjun
|
96d036d6c0
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
4 years ago |
