jianjun
							
						 | 
						
							
							
							
								
							
								a3f15f7d8a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								184adf4a62
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								386001d926
								
							
								
							
						 | 
						
							
							
								
								通知已读未读列表查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								946603f8c7
								
							
								
							
						 | 
						
							
							
								
								okhttp时间 缩短,添加日志记录接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c49b7a8c46
								
							
								
							
						 | 
						
							
							
								
								小组成就详情
							
							
							
							
							
							
								
							
							
							组长解决话题积分 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								525764588c
								
							
								
							
						 | 
						
							
							
								
								创建小组修改不是党员不能创建支部小组,
							
							
							
							
							
							
								
							
							
							待审核的小组列表反参添加groupType 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c81c9c66d3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2dd616a619
								
							
								
							
						 | 
						
							
							
								
								小组通知、活动分享
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								40ce017e74
								
							
								
							
						 | 
						
							
							
								
								8905错误编码
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								58cd53468f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a36e5444ef
								
							
								
							
						 | 
						
							
							
								
								楼院小组新增错误编码,8903、8904
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6b1a6192d7
								
							
								
							
						 | 
						
							
							
								
								小组通知变更
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3890aa1002
								
							
								
							
						 | 
						
							
							
								
								积分规则添加 未删除条件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ea11682f49
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								18bffe8aa1
								
							
								
							
						 | 
						
							
							
								
								楼院小组新增错误编码,8901、8902,日后楼院小组统一用89xx吧
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4d4f47c5e6
								
							
								
							
						 | 
						
							
							
								
								推荐小组添加 groupType,小组类型 != 支部
							
							
							
							
							
							
								
							
							
							我的小组添加groupType 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3e837b320d
								
							
								
							
						 | 
						
							
							
								
								加速 加速 不明显
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								6439fa4db0
								
							
								
							
						 | 
						
							
							
								
								创建小组添加 groupType
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								eed1afa908
								
							
								
							
						 | 
						
							
							
								
								创建小组添加 groupType
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3d6ff089ef
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								61c2ed6ad7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
#	epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								06467acabf
								
							
								
							
						 | 
						
							
							
								
								活动类别字典
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5a2758b3a2
								
							
								
							
						 | 
						
							
							
								
								优化footBar方法
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c723ecd776
								
							
								
							
						 | 
						
							
							
								
								编译
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fa76242e0b
								
							
								
							
						 | 
						
							
							
								
								小组通知保存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								705efe9d43
								
							
								
							
						 | 
						
							
							
								
								去掉多线程
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2c49647fee
								
							
								
							
						 | 
						
							
							
								
								小组成就相关表代码生成
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								57dab627cc
								
							
								
							
						 | 
						
							
							
								
								开个线程试试
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ae6f195fab
								
							
								
							
						 | 
						
							
							
								
								接口代码结构微调 性能暂无变化
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2d64a43b82
								
							
								
							
						 | 
						
							
							
								
								获取网格基础信息接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1ca7460013
								
							
								
							
						 | 
						
							
							
								
								获取网格基础信息接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7a623cf1e0
								
							
								
							
						 | 
						
							
							
								
								获取网格基础信息接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								93ce9becdd
								
							
								
							
						 | 
						
							
							
								
								列名修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b3e6c154f7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								726db623dc
								
							
								
							
						 | 
						
							
							
								
								列名修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3b2efc5990
								
							
								
							
						 | 
						
							
							
								
								小组通知代码生成
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4e0112ca02
								
							
								
							
						 | 
						
							
							
								
								改为okhttp试试 看看是否还超时  上线
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4644539c4e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8c394f2d4d
								
							
								
							
						 | 
						
							
							
								
								改为okhttp试试 看看是否还超时
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								78dc00de47
								
							
								
							
						 | 
						
							
							
								
								代码初始提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1c49996f52
								
							
								
							
						 | 
						
							
							
								
								项目立项添加操作权限
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ebfa49c6cc
								
							
								
							
						 | 
						
							
							
								
								项目立项标题20字
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b67b3b7d10
								
							
								
							
						 | 
						
							
							
								
								调整调用第三方日志 上线
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2038793338
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ead9dbf83d
								
							
								
							
						 | 
						
							
							
								
								调整调用第三方日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								54106eccd3
								
							
								
							
						 | 
						
							
							
								
								agencyDetail
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bf753487ff
								
							
								
							
						 | 
						
							
							
								
								agencyDetail
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3d7e1af75c
								
							
								
							
						 | 
						
							
							
								
								修改组织信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8d647eab78
								
							
								
							
						 | 
						
							
							
								
								修改组织信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d6b180806f
								
							
								
							
						 | 
						
							
							
								
								事件分析 org-月 统计
							
							
							
							
								
							
							
						 | 
						5 years ago |