Tree: 09d150ebcc

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '09d150ebcc'

${ noResults }

Commit Graph

10113 Commits (09d150ebccd9b8067cdc970f05cd25a408e06567)

 

All Branches   

Search

Author	SHA1	Message	Date
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
yinzuomei	54aa36e255	Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice	5 years ago
yinzuomei	3a279ff4b6	活动总结详情bug修改	5 years ago
zhaoqifeng	e1ca5ec6a6	积分统计消息级别	5 years ago
sunyuchao	fdd60e21d2	Merge branch 'dev_group_act_notice' into dev_temp	5 years ago
sunyuchao	38d5f5c699	掉头发	5 years ago
sunyuchao	f13fe881e5	代码合并问题	5 years ago
sunyuchao	12cc05a3dd	Merge branch '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
zxc	b86634ea02	小组历史数据添加未读数	5 years ago
zxc	1776b4d84b	isChanged修改	5 years ago
sunyuchao	71b56c81d8	isChanged改为true false	5 years ago
zxc	7484ca70cb	为 if，else添加大括号	5 years ago
sunyuchao	487d82f48c	Merge branch 'dev_group_act_notice' into dev_temp	5 years ago
sunyuchao	caa46d0a6f	接口调整 不在吧通知详情与阅读放在一起	5 years ago
sunyuchao	6d5282b4c5	Merge branch 'dev_group_act_notice' into dev_temp	5 years ago
sunyuchao	a7c616dada	Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice	5 years ago
sunyuchao	c3c2a68482	bug修改	5 years ago
yinzuomei	6b8266ea5d	Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp	5 years ago
yinzuomei	475432542b	工作端查看活动详情	5 years ago
sunyuchao	789af45fdd	Merge branch 'dev_group_act_notice' into dev_temp	5 years ago
sunyuchao	b27533c27a	Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice	5 years ago
sunyuchao	cd47bb5a36	查询通知详情时修改阅读状态	5 years ago
yinzuomei	129b35e182	Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp	5 years ago
yinzuomei	3c9b4a77e1	修改grouptypelist接口，优先查询当前客户，如果当前客户没有配置，默认查询default。	5 years ago
yinzuomei	87452500a4	Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp	5 years ago