jianjun
|
12fc29c308
|
Merge remote-tracking branch 'remotes/origin/dev_project_real_time_statistics' 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/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
|
5 years ago |
zxc
|
6e3e4d5c58
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
zxc
|
41f8c855ef
|
历史话题
|
5 years ago |
zhaoqifeng
|
08c121c080
|
项目实时统计消息
|
5 years ago |
sunyuchao
|
3958b5d0f8
|
进入网格接口添加真实人名返参
|
5 years ago |
|
jianjun
|
1d0cf239e3
|
stats 项目变动订阅消息
|
5 years ago |
yinzuomei
|
c332e9ac46
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
b648538754
|
/resi/group/actsign/geturl修改
|
5 years ago |
|
jianjun
|
ffcd3d47eb
|
stats 项目变动订阅消息
|
5 years ago |
|
jianjun
|
0cc8b9b3a9
|
项目变动发送消息
|
5 years ago |
|
sunyuchao
|
35737febbc
|
Merge branch 'dev_group_act_notice' into dev_temp
|
5 years ago |
|
sunyuchao
|
0459b8a686
|
bug修改
|
5 years ago |
|
sunyuchao
|
6c9ef49a57
|
可胜任组长列表接口调整
|
5 years ago |
|
zxc
|
518cba2721
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
sunyuchao
|
a668458cb6
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
sunyuchao
|
412f182c66
|
代码调整
|
5 years ago |
|
zxc
|
6f7e7d8fc0
|
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/ResiTopicCommentServiceImpl.java
|
5 years ago |
|
zxc
|
37d7a64826
|
待审核，已驳回 议题 详情
|
5 years ago |
|
sunyuchao
|
8d037bd95b
|
话题评论列表接口按组类型返人名
|
5 years ago |
|
zxc
|
e8c6aa2c44
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
zxc
|
cb901a57b7
|
待审核，已驳回 话题 详情
|
5 years ago |
|
jianjun
|
ec233ce5dc
|
升级rocketmq版本
|
5 years ago |
|
jianjun
|
24a80d793d
|
Revert "使用rocketmq注解"
This reverts commit 6c07d68d
|
5 years ago |
|
zxc
|
3c0a3ac889
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
zxc
|
306ab61657
|
待审核，已驳回议题详情修改
|
5 years ago |
|
sunyuchao
|
ae954150ce
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
sunyuchao
|
18b4472e95
|
议题详情涉及话题人议题人按组类型返人名
|
5 years ago |
|
jianjun
|
efb21c2ace
|
Revert "升级rocketmq版本"
This reverts commit 39f3671f
|
5 years ago |
|
jianjun
|
39f3671f6a
|
升级rocketmq版本
|
5 years ago |
|
jianjun
|
dd66238959
|
使用rocketmq注解
|
5 years ago |
|
jianjun
|
5f0fc2ca9f
|
Revert "使用rocketmq注解"
This reverts commit 6c07d68d
|
5 years ago |
|
jianjun
|
6c07d68d6c
|
使用rocketmq注解
|
5 years ago |
|
zxc
|
9657a77123
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
zxc
|
2abcfd8789
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
zxc
|
2f931a2014
|
小组历史查询，小组近十条 添加isChange
|
5 years ago |
|
sunyuchao
|
70b2473890
|
话题详情接口按组类型返回人员名称
|
5 years ago |
|
jianjun
|
6f899d3203
|
消息消费失败重试
|
5 years ago |
|
zxc
|
5b547e526c
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
zxc
|
91ca0045fc
|
content 活动和通知修改成 title
|
5 years ago |
|
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
|
5 years ago |
|
sunyuchao
|
ccee1a6ac9
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
sunyuchao
|
eb01bb1947
|
屏蔽话题列表查询接口按组类型返人名名称
|
5 years ago |
|
zxc
|
ee4a8d7570
|
入组审核列表 姓名修改
|
5 years ago |
|
jianjun
|
e87b4d33e8
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
5 years ago |
|
jianjun
|
2dc1fd1d4b
|
日志优化
|
5 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
|
5 years ago |
|
zxc
|
85845728c2
|
小组成员查询姓名变动
|
5 years ago |
|
sunyuchao
|
2219406d36
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
sunyuchao
|
7c5a12c19f
|
代码微调
|
5 years ago |
|
zxc
|
ec39dc6d75
|
处理 用户头像和姓名 提成方法
|
5 years ago |
