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 | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cf17ea2587
								
							
								
							
						 | 
						
							
							
								
								添加群组
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5fa3d88a95
								
							
								
							
						 | 
						
							
							
								
								楼梯代码
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d37b28c197
								
							
								
							
						 | 
						
							
							
								
								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/controller/EpmetUserController.java
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f35debd77c
								
							
								
							
						 | 
						
							
							
								
								代码暂存 避免大量冲突
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								612cb410f8
								
							
								
							
						 | 
						
							
							
								
								通讯录消息相关接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a23f5a89f5
								
							
								
							
						 | 
						
							
							
								
								通讯录消息相关接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								35d8dfcd9b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a410bb0f7c
								
							
								
							
						 | 
						
							
							
								
								漏提代码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0011bb1b7e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1aaa3cbdd5
								
							
								
							
						 | 
						
							
							
								
								发送消息
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								39d6b3a03d
								
							
								
							
						 | 
						
							
							
								
								接口名调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7d01a81e9a
								
							
								
							
						 | 
						
							
							
								
								工作人员解禁
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e97975e24e
								
							
								
							
						 | 
						
							
							
								
								新增工作人员V2-漏提文件
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5eef00b0b1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a4f9bd10f8
								
							
								
							
						 | 
						
							
							
								
								概要表的att_id=》first_att_id且可空
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								afe15fef3e
								
							
								
							
						 | 
						
							
							
								
								新增工作人员V2
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								835f7371b4
								
							
								
							
						 | 
						
							
							
								
								请选择接收人
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2e21304aa5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1adc371a44
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_repeat_aop' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3e8b3e4788
								
							
								
							
						 | 
						
							
							
								
								通讯录接口模板提交
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c04da794db
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c904f4178f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cffcf8eef2
								
							
								
							
						 | 
						
							
							
								
								网格员巡查
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f9d03c4de3
								
							
								
							
						 | 
						
							
							
								
								消息相关表sql提交,生成代码提交
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								54acd64931
								
							
								
							
						 | 
						
							
							
								
								修改:CPAuthxxx,增加打印header列表,给gateway日志绑定tranSerail
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7bc990fb31
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_category_top20' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2c1cef9822
								
							
								
							
						 | 
						
							
							
								
								排序暂时修改
							
							
							
							
								
							
							
						 | 
						4 years ago |