zxc
							
						 | 
						
							
							
							
								
							
								3b159e3c6b
								
							
								
							
						 | 
						
							
							
								
								【发送消息】我收到、我发送红点
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								65dc7fa8c1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								fb0b753d7e
								
							
								
							
						 | 
						
							
							
								
								更正地址
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								59cd4ab394
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8fdafb6229
								
							
								
							
						 | 
						
							
							
								
								【通讯录】人员详情v2
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5190df4002
								
							
								
							
						 | 
						
							
							
								
								删除无用的redis 类
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6d4fd0918e
								
							
								
							
						 | 
						
							
							
								
								修改redis key
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								08ffe39470
								
							
								
							
						 | 
						
							
							
								
								修改注释
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1905977530
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6fc9cb85b0
								
							
								
							
						 | 
						
							
							
								
								删除无用方法
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								aaeb1ad4a7
								
							
								
							
						 | 
						
							
							
								
								通讯录消息相关接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								19a96955f5
								
							
								
							
						 | 
						
							
							
								
								回复和群组列表,赋值towOrgName
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5c89786c68
								
							
								
							
						 | 
						
							
							
								
								添加2级组织名称
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3db33a1260
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								199961197b
								
							
								
							
						 | 
						
							
							
								
								添加2级组织名称
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7caf76f37e
								
							
								
							
						 | 
						
							
							
								
								通讯录消息相关接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3866ab4ece
								
							
								
							
						 | 
						
							
							
								
								回复列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d95c654291
								
							
								
							
						 | 
						
							
							
								
								【通讯录】组织/部门/网格下人员列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								996a089cd0
								
							
								
							
						 | 
						
							
							
								
								添加类型
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c25da91e9b
								
							
								
							
						 | 
						
							
							
								
								发送消息-群组列表、群详情
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								22785feb12
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_category_top20' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e038dbf604
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into release_temp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								95eeae487a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_category_top20' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d33487737b
								
							
								
							
						 | 
						
							
							
								
								分类名字查询修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								97a89a1c69
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f01ec127b6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into release_temp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								04f497115b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b1ead3d4c8
								
							
								
							
						 | 
						
							
							
								
								巡查人数优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ddc38b1f77
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1ca30f2774
								
							
								
							
						 | 
						
							
							
								
								先提交一部分
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cf17ea2587
								
							
								
							
						 | 
						
							
							
								
								添加群组
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f655d7895b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								bd413ab9e8
								
							
								
							
						 | 
						
							
							
								
								巡查
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c29cf19a1a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1e5413ea8d
								
							
								
							
						 | 
						
							
							
								
								导出 上线
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5fa3d88a95
								
							
								
							
						 | 
						
							
							
								
								楼梯代码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7aa539baf0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d2c92de554
								
							
								
							
						 | 
						
							
							
								
								导出巡查记录
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7ebeaead8d
								
							
								
							
						 | 
						
							
							
								
								获取工作人员缓存代码提交
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7b8c5c5b46
								
							
								
							
						 | 
						
							
							
								
								代码暂存 避免大量冲突
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ea1bba0ace
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b3f207821f
								
							
								
							
						 | 
						
							
							
								
								回复、接收人阅读消息、发布人查看回复
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c8c8d32cba
								
							
								
							
						 | 
						
							
							
								
								通讯录消息相关接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								59ada443c6
								
							
								
							
						 | 
						
							
							
								
								字段补充
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7fa8bbfd1b
								
							
								
							
						 | 
						
							
							
								
								【通讯录】姓名检索工作人员
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								376501061f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f84506ea7b
								
							
								
							
						 | 
						
							
							
								
								发送消息同时发送站内信,增加info,infoId到user_message表,方便日后跳转消息详情。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								92ffdade57
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								794047aee3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into release_temp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								085ee3419e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago |