zxc
|
0188cab0e6
|
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/group/service/impl/ResiGroupServiceImpl.java
|
4 years ago |
|
zxc
|
4de03750be
|
代码微调
|
4 years ago |
jianjun
|
ead06f2c50
|
Merge remote-tracking branch 'remotes/origin/dev_project_real_time_statistics' into dev_temp
|
4 years ago |
|
jianjun
|
f4df2b1748
|
测试mq消息
|
4 years ago |
yinzuomei
|
4d64c41cbe
|
活动已读未读，增加VIEW_DETAIL
|
4 years ago |
|
jianjun
|
fefa070f85
|
恢复内容
|
4 years ago |
zhaoqifeng
|
d4c37f4640
|
Merge branch 'dev_project_real_time_statistics' into dev_temp
|
4 years ago |
sunyuchao
|
80d0643d11
|
组信息编辑-申请详情接口按组类型返回真实人名
|
4 years ago |
|
zhaoqifeng
|
24262f4d09
|
大屏事件级别统计逻辑修改
|
4 years ago |
|
jianjun
|
612e3abe64
|
Merge remote-tracking branch 'remotes/origin/dev_project_real_time_statistics' into dev_temp
|
4 years ago |
|
jianjun
|
3e8e5c922c
|
测试发送内容
|
4 years ago |
|
zxc
|
709e6505eb
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
4 years ago |
|
zxc
|
c36b7c19cf
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
|
4 years ago |
|
jianjun
|
83329330a6
|
Merge remote-tracking branch 'remotes/origin/dev_project_real_time_statistics' into dev_temp
|
4 years ago |
|
jianjun
|
a640156c54
|
测试发送内容
|
4 years ago |
|
zxc
|
65bcbca974
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
4 years ago |
|
zxc
|
502e52eef1
|
所有信息查询工作端
|
4 years ago |
|
sunyuchao
|
3db20811b0
|
已屏蔽话题列表接口按组类型返回真实人名
|
4 years ago |
|
jianjun
|
8908fc7dd4
|
Merge remote-tracking branch 'remotes/origin/dev_project_real_time_statistics' into dev_temp
|
4 years ago |
|
jianjun
|
5cf34fbef3
|
测试发送内容
|
4 years ago |
|
sunyuchao
|
75a2469aba
|
小组管理界面接口按组类型返回真实人名
|
4 years ago |
|
jianjun
|
1fd3a30b83
|
Merge remote-tracking branch 'remotes/origin/dev_project_real_time_statistics' into dev_temp
|
4 years ago |
|
jianjun
|
aea6c344cf
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
c5670c763e
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
4 years ago |
|
yinzuomei
|
eeceed2f30
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
jianjun
|
6af2a2da15
|
测试发送内容
|
4 years ago |
|
yinzuomei
|
c422a839e5
|
为民服务发布活动修改
|
4 years ago |
|
yinzuomei
|
8053442c30
|
py中央区项目实时抽取，只更新4个表
|
4 years ago |
|
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
|
4 years ago |
|
zxc
|
6e3e4d5c58
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
zxc
|
41f8c855ef
|
历史话题
|
4 years ago |
|
zhaoqifeng
|
08c121c080
|
项目实时统计消息
|
4 years ago |
|
sunyuchao
|
3958b5d0f8
|
进入网格接口添加真实人名返参
|
4 years ago |
|
jianjun
|
1d0cf239e3
|
stats 项目变动订阅消息
|
4 years ago |
|
yinzuomei
|
c332e9ac46
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
b648538754
|
/resi/group/actsign/geturl修改
|
4 years ago |
|
jianjun
|
ffcd3d47eb
|
stats 项目变动订阅消息
|
4 years ago |
|
jianjun
|
0cc8b9b3a9
|
项目变动发送消息
|
4 years ago |
|
sunyuchao
|
35737febbc
|
Merge branch 'dev_group_act_notice' into dev_temp
|
4 years ago |
|
sunyuchao
|
0459b8a686
|
bug修改
|
4 years ago |
|
sunyuchao
|
6c9ef49a57
|
可胜任组长列表接口调整
|
4 years ago |
|
zxc
|
518cba2721
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
sunyuchao
|
a668458cb6
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
4 years ago |
|
sunyuchao
|
412f182c66
|
代码调整
|
4 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
|
4 years ago |
|
zxc
|
37d7a64826
|
待审核，已驳回 议题 详情
|
4 years ago |
|
sunyuchao
|
8d037bd95b
|
话题评论列表接口按组类型返人名
|
4 years ago |
|
zxc
|
e8c6aa2c44
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
zxc
|
cb901a57b7
|
待审核，已驳回 话题 详情
|
4 years ago |
|
jianjun
|
ec233ce5dc
|
升级rocketmq版本
|
4 years ago |
