sunyuchao
							
						 | 
						
							
							
							
								
							
								af27a2594e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_operate_syc' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								276622a5e4
								
							
								
							
						 | 
						
							
							
								
								公众参与NPE 修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								648f3a2ec9
								
							
								
							
						 | 
						
							
							
								
								运营端部分接口涉及图片没有赋值客户ID问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								dc50222aae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								135c3e34b3
								
							
								
							
						 | 
						
							
							
								
								没有数据时不再继续执行
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5904f88839
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								cc0491f7e7
								
							
								
							
						 | 
						
							
							
								
								项目处理进展上报 代码优化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c911faa853
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								51a2756887
								
							
								
							
						 | 
						
							
							
								
								项目统计分析查询bug
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								efa9cc5a06
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1fcc609c58
								
							
								
							
						 | 
						
							
							
								
								事件分析 组织-月 代码调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a5bef8fcd7
								
							
								
							
						 | 
						
							
							
								
								解决运营端生成小程序体验码时文件表没有客户Id问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c2a583b6ae
								
							
								
							
						 | 
						
							
							
								
								月度指数分析-饼状图 修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1bd50ced75
								
							
								
							
						 | 
						
							
							
								
								项目分布 绿色限制200
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								64ea0a2fc4
								
							
								
							
						 | 
						
							
							
								
								工作端-待审核||已驳回 申请详情-接口查询话题附件时只查询图片附件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d7373ee97d
								
							
								
							
						 | 
						
							
							
								
								加强判断
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								82bf80a093
								
							
								
							
						 | 
						
							
							
								
								加强判断
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bd66a7a024
								
							
								
							
						 | 
						
							
							
								
								mq注册代码调整暂时恢复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a19961839a
								
							
								
							
						 | 
						
							
							
								
								exit group
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9e37ccf857
								
							
								
							
						 | 
						
							
							
								
								gettopicdetail微调
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8d8c7408b3
								
							
								
							
						 | 
						
							
							
								
								gettopicdetail接口微调
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ba9b14de42
								
							
								
							
						 | 
						
							
							
								
								exit group
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								87405f8dbd
								
							
								
							
						 | 
						
							
							
								
								组创建默认图片尺寸不合适问题
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								eb6de5b2d8
								
							
								
							
						 | 
						
							
							
								
								edit
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								4dc7373e0b
								
							
								
							
						 | 
						
							
							
								
								selectUnReadInfos
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4d4d17eed8
								
							
								
							
						 | 
						
							
							
								
								mq注册代码调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8847faa455
								
							
								
							
						 | 
						
							
							
								
								getPastTopicListV2ByIds
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								14317135cf
								
							
								
							
						 | 
						
							
							
								
								活动详情增加发布时间返参
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c993864bc1
								
							
								
							
						 | 
						
							
							
								
								点击分享链接,查看活动详情
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9af2be58cc
								
							
								
							
						 | 
						
							
							
								
								积分人工调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c2d5810ef2
								
							
								
							
						 | 
						
							
							
								
								小组近段时间实现的成就列表-轮播修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								cadd9aeb89
								
							
								
							
						 | 
						
							
							
								
								积分规则修改脚本
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0bea862c79
								
							
								
							
						 | 
						
							
							
								
								未读人数添加默认值
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1c94e027d6
								
							
								
							
						 | 
						
							
							
								
								插入积分规则
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								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 |