yinzuomei
|
4dc7373e0b
|
selectUnReadInfos
|
5 years ago |
jianjun
|
a882ede140
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
5 years ago |
|
jianjun
|
4d4d17eed8
|
mq注册代码调整
|
5 years ago |
|
yinzuomei
|
043556186c
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
8847faa455
|
getPastTopicListV2ByIds
|
5 years ago |
|
yinzuomei
|
fe894a8eba
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
a0ae52dd28
|
group_act_info增加IS_CHANGE，近十条+2个历史消息
|
5 years ago |
|
yinzuomei
|
4ddd5e0b08
|
group_act_info增加IS_CHANGE
|
5 years ago |
|
yinzuomei
|
573fd5a0c5
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
14317135cf
|
活动详情增加发布时间返参
|
5 years ago |
|
yinzuomei
|
c993864bc1
|
点击分享链接，查看活动详情
|
5 years ago |
zhaoqifeng
|
6dbeb0f59c
|
Merge branch 'dev_group_point' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
9af2be58cc
|
积分人工调整
|
5 years ago |
zxc
|
e32b370458
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
0e59865cfd
|
Merge branch 'dev_group_point' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
|
5 years ago |
|
zhaoqifeng
|
c2d5810ef2
|
小组近段时间实现的成就列表-轮播修改
|
5 years ago |
|
zhaoqifeng
|
cadd9aeb89
|
积分规则修改脚本
|
5 years ago |
|
zxc
|
0bea862c79
|
未读人数添加默认值
|
5 years ago |
|
jianjun
|
1c94e027d6
|
插入积分规则
|
5 years ago |
|
yinzuomei
|
aad615693c
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
b938632df6
|
点击分享链接，查看活动详情
|
5 years ago |
|
yinzuomei
|
3ab4bca647
|
活动关闭前，发布时后入群的同样插入已读记录
|
5 years ago |
|
zhaoqifeng
|
2939747356
|
Merge remote-tracking branch 'origin/dev_group_point' into dev_group_point
|
5 years ago |
|
zhaoqifeng
|
6ca31bcd00
|
积分规则修改脚本
|
5 years ago |
|
jianjun
|
09d150ebcc
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java
# epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
|
5 years ago |
|
jianjun
|
1d973f395a
|
本地环境不注册 mq消费者
|
5 years ago |
|
jianjun
|
bb185bcaba
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_group_point
# Conflicts:
# epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
# epmet-module/epmet-message/epmet-message-client/pom.xml
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java
# epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
# 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
|
5 years ago |
|
yinzuomei
|
4389ab8874
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
jianjun
|
412ba02c99
|
Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
jianjun
|
45e480d2ed
|
组内贡献成员名称微调
|
5 years ago |
|
jianjun
|
d9c98c3085
|
Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
jianjun
|
43757be6fa
|
组内贡献成员名称微调
|
5 years ago |
|
yinzuomei
|
9e299e1219
|
活动已读后，act_read_record不再更新。
|
5 years ago |
|
jianjun
|
95e6bc0f08
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
5 years ago |
|
jianjun
|
e295ee70cf
|
组内贡献成员名称微调 缺了括号
|
5 years ago |
|
jianjun
|
d4d4386f7b
|
Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
jianjun
|
a6db6aa399
|
组内贡献成员名称微调
|
5 years ago |
|
jianjun
|
b93180b892
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
5 years ago |
|
jianjun
|
7249843eab
|
Merge remote-tracking branch 'origin/dev_group_point' into dev_group_point
|
5 years ago |
|
jianjun
|
7020f95705
|
枚举包移动
|
5 years ago |
sunyuchao
|
e1446748ab
|
Merge branch 'dev_group_act_notice' into dev_temp
|
5 years ago |
|
sunyuchao
|
ee05709cc3
|
小组名sql
|
5 years ago |
|
sunyuchao
|
2e840ff134
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
sunyuchao
|
e326ae91a6
|
Merge branch 'dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
3c14a2d953
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
6584c502e4
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
yinzuomei
|
4171b9c7c0
|
编辑活动，删除活动内容
|
5 years ago |
|
zxc
|
d14b382021
|
delFlag
|
5 years ago |
|
zhaoqifeng
|
bf2f7f020f
|
Merge branch 'dev_group_point' into dev_temp
|
5 years ago |
|
yinzuomei
|
f5a7e7f1b0
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
