jianjun
|
3465fabba1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
|
4 years ago |
|
jianjun
|
1bd50ced75
|
项目分布 绿色限制200
|
4 years ago |
sunyuchao
|
9a340c35da
|
Merge branch 'dev_group_act_notice' into dev_temp
|
4 years ago |
|
sunyuchao
|
64ea0a2fc4
|
工作端-待审核||已驳回 申请详情-接口查询话题附件时只查询图片附件
|
4 years ago |
|
jianjun
|
57c11475f5
|
Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
d7373ee97d
|
加强判断
|
4 years ago |
|
jianjun
|
05285d4989
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
4 years ago |
|
jianjun
|
82bf80a093
|
加强判断
|
4 years ago |
|
jianjun
|
031de76840
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
4 years ago |
|
jianjun
|
dfad4a228e
|
Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
bd66a7a024
|
mq注册代码调整暂时恢复
|
4 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
|
4 years ago |
|
yinzuomei
|
a19961839a
|
exit group
|
4 years ago |
zxc
|
c687a995dd
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
zxc
|
9e37ccf857
|
gettopicdetail微调
|
4 years ago |
|
zxc
|
c1b1b64a07
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
zxc
|
8d8c7408b3
|
gettopicdetail接口微调
|
4 years ago |
|
yinzuomei
|
b8525cb462
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
ba9b14de42
|
exit group
|
4 years ago |
zhaoqifeng
|
479acb223e
|
Merge branch 'dev_group_point' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
5c77a1016f
|
Merge remote-tracking branch 'origin/dev_group_point' into dev_group_point
|
4 years ago |
|
zhaoqifeng
|
b4e9faa026
|
话题审核通过积分消息内容调整
|
4 years ago |
|
sunyuchao
|
a97c70d609
|
Merge branch 'dev_group_act_notice' into dev_temp
|
4 years ago |
|
sunyuchao
|
87405f8dbd
|
组创建默认图片尺寸不合适问题
|
4 years ago |
|
jianjun
|
40b3de1bce
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
4 years ago |
|
jianjun
|
524a0c592e
|
mq注册代码调整-漏掉的代码合并
|
4 years ago |
|
jianjun
|
8696244970
|
Merge remote-tracking branch 'remotes/origin/dev_mq_init_customer' into dev_group_point
|
4 years ago |
|
zxc
|
57591fa2c5
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
zxc
|
eb6de5b2d8
|
edit
|
4 years ago |
|
jianjun
|
484421b2ac
|
Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
3c88c7d35f
|
mq注册代码调整-本地不注册
|
4 years ago |
|
sunyuchao
|
2e7759ba91
|
历史数据返图片
|
4 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
|
4 years ago |
|
sunyuchao
|
4b0a445664
|
通知活动未读列表添加活动状态返参
|
4 years ago |
|
yinzuomei
|
c900af70bf
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
4dc7373e0b
|
selectUnReadInfos
|
4 years ago |
|
jianjun
|
a882ede140
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
4 years ago |
|
jianjun
|
4d4d17eed8
|
mq注册代码调整
|
4 years ago |
|
yinzuomei
|
043556186c
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
8847faa455
|
getPastTopicListV2ByIds
|
4 years ago |
|
yinzuomei
|
fe894a8eba
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
a0ae52dd28
|
group_act_info增加IS_CHANGE，近十条+2个历史消息
|
4 years ago |
|
yinzuomei
|
4ddd5e0b08
|
group_act_info增加IS_CHANGE
|
4 years ago |
|
yinzuomei
|
573fd5a0c5
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
14317135cf
|
活动详情增加发布时间返参
|
4 years ago |
|
yinzuomei
|
c993864bc1
|
点击分享链接，查看活动详情
|
4 years ago |
|
zhaoqifeng
|
6dbeb0f59c
|
Merge branch 'dev_group_point' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
9af2be58cc
|
积分人工调整
|
4 years ago |
|
zxc
|
e32b370458
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 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
|
4 years ago |
