jianjun
|
bd66a7a024
|
mq注册代码调整暂时恢复
|
5 years ago |
yinzuomei
|
a642aa6574
|
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/member/dao/ResiGroupMemberDao.java
|
5 years ago |
|
yinzuomei
|
a19961839a
|
exit group
|
5 years ago |
zxc
|
c687a995dd
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
zxc
|
9e37ccf857
|
gettopicdetail微调
|
5 years ago |
|
zxc
|
c1b1b64a07
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
zxc
|
8d8c7408b3
|
gettopicdetail接口微调
|
5 years ago |
|
yinzuomei
|
b8525cb462
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
ba9b14de42
|
exit group
|
5 years ago |
zhaoqifeng
|
479acb223e
|
Merge branch 'dev_group_point' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
5c77a1016f
|
Merge remote-tracking branch 'origin/dev_group_point' into dev_group_point
|
5 years ago |
|
zhaoqifeng
|
b4e9faa026
|
话题审核通过积分消息内容调整
|
5 years ago |
sunyuchao
|
a97c70d609
|
Merge branch 'dev_group_act_notice' into dev_temp
|
5 years ago |
|
sunyuchao
|
87405f8dbd
|
组创建默认图片尺寸不合适问题
|
5 years ago |
|
jianjun
|
40b3de1bce
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
5 years ago |
|
jianjun
|
524a0c592e
|
mq注册代码调整-漏掉的代码合并
|
5 years ago |
|
jianjun
|
8696244970
|
Merge remote-tracking branch 'remotes/origin/dev_mq_init_customer' into dev_group_point
|
5 years ago |
|
zxc
|
57591fa2c5
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
zxc
|
eb6de5b2d8
|
edit
|
5 years ago |
|
jianjun
|
484421b2ac
|
Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
jianjun
|
3c88c7d35f
|
mq注册代码调整-本地不注册
|
5 years ago |
|
sunyuchao
|
2e7759ba91
|
历史数据返图片
|
5 years ago |
|
sunyuchao
|
d689d5a17d
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
|
5 years ago |
|
sunyuchao
|
4b0a445664
|
通知活动未读列表添加活动状态返参
|
5 years ago |
|
yinzuomei
|
c900af70bf
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
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 |
