yinzuomei
							
						 | 
						
							
							
							
								
							
								dc3d236466
								
							
								
							
						 | 
						
							
							
								
								详情
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								22aa410077
								
							
								
							
						 | 
						
							
							
								
								myreceived
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9d2361e59f
								
							
								
							
						 | 
						
							
							
								
								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 | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fab731eb5b
								
							
								
							
						 | 
						
							
							
								
								mysent
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								29aee85d01
								
							
								
							
						 | 
						
							
							
								
								地址修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f67f1ea1f6
								
							
								
							
						 | 
						
							
							
								
								微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bdd006f0d2
								
							
								
							
						 | 
						
							
							
								
								微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f70d397c42
								
							
								
							
						 | 
						
							
							
								
								缓存key调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bed190232d
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d01422d410
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2b279651ff
								
							
								
							
						 | 
						
							
							
								
								CustomerStaffRedis调整为静态方法 无需注入直接使用
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6e8bd6fe69
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								54bc6913ed
								
							
								
							
						 | 
						
							
							
								
								【发送消息】我收到、我发送红点
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7c3e4c60be
								
							
								
							
						 | 
						
							
							
								
								程序补缺
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0609547ee8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								87668f1804
								
							
								
							
						 | 
						
							
							
								
								待修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5df83046a9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3590210020
								
							
								
							
						 | 
						
							
							
								
								info表的content增加全文索引
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								460f684904
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2a4fae8799
								
							
								
							
						 | 
						
							
							
								
								脚本调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1afe985ce6
								
							
								
							
						 | 
						
							
							
								
								脚本调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f7839c30a5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
								
							
								d33487737b
								
							
								
							
						 | 
						
							
							
								
								分类名字查询修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								97a89a1c69
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b1ead3d4c8
								
							
								
							
						 | 
						
							
							
								
								巡查人数优化
							
							
							
							
								
							
							
						 | 
						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 |