yinzuomei
							
						 | 
						
							
							
							
								
							
								bd58072b31
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								20b31fd842
								
							
								
							
						 | 
						
							
							
								
								服务方单位名称查询
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								642cdfd4ae
								
							
								
							
						 | 
						
							
							
								
								测试代码调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ad6d8eb00a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_mp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								de4903426d
								
							
								
							
						 | 
						
							
							
								
								代码清理
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7b1e152bbf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fbeb2e18ab
								
							
								
							
						 | 
						
							
							
								
								不扶墙也得服你
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								11f07950d1
								
							
								
							
						 | 
						
							
							
								
								预约修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8ed2e8c902
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2699f67ce1
								
							
								
							
						 | 
						
							
							
								
								需求发送消息。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								36f32aa223
								
							
								
							
						 | 
						
							
							
								
								project库sql
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6a67498d54
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8d91213f7a
								
							
								
							
						 | 
						
							
							
								
								.
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								75b1220834
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_mp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								27be013b2d
								
							
								
							
						 | 
						
							
							
								
								日志级别调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0563b38102
								
							
								
							
						 | 
						
							
							
								
								日志级别调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6d5531e076
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f034060dd9
								
							
								
							
						 | 
						
							
							
								
								事件保存查询
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1c87a9d0b8
								
							
								
							
						 | 
						
							
							
								
								去掉默认赋值根组织中心点
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								56ceafd039
								
							
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								d46ac4de41
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								e3bfd50fde
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							三个接口customerId参数的使用逻辑调整 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4b0264ef65
								
							
								
							
						 | 
						
							
							
								
								去掉 默认跟组织的中心点
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								0bcb12f842
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							/screen/index/advancedbranchrank
report/screen/user/partypointrank
user/userpointrank/withoutpartymember
增加customerId可选参数 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								a3d299884b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								afd9b1e6ee
								
							
								
							
						 | 
						
							
							
								
								pc完成需求调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8f0b81b16d
								
							
								
							
						 | 
						
							
							
								
								修改楼宇排序 先按创建时间 再按楼宇名称;房屋排序将单元号转为数字排
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								174f54863f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0f30cca68b
								
							
								
							
						 | 
						
							
							
								
								最近预约、需求分类
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								e86f65eb31
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_dim_sync
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								aedc0b639e
								
							
								
							
						 | 
						
							
							
								
								服务电话查询、未读消息删除
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								14487d3f70
								
							
								
							
						 | 
						
							
							
								
								左侧树也排一下顺序
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a2399ec2eb
								
							
								
							
						 | 
						
							
							
								
								加点注释
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								af75898b9c
								
							
								
							
						 | 
						
							
							
								
								.
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b6971f41fa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0094461b77
								
							
								
							
						 | 
						
							
							
								
								工作端通讯录
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								82f7e51d7b
								
							
								
							
						 | 
						
							
							
								
								小区 楼宇 房屋 排序
							
							
							
							
							
							
								
							
							
							小区创建时间
楼宇  漏洞名称
房屋 单元-门牌号 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								01a7f9332a
								
							
								
							
						 | 
						
							
							
								
								党群服务中心列表查询修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ab8e163a9d
								
							
								
							
						 | 
						
							
							
								
								最新直报返参附件类型分为图片和语音
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d53b89219c
								
							
								
							
						 | 
						
							
							
								
								评价+取消需求
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0c146e9570
								
							
								
							
						 | 
						
							
							
								
								需求表存储需求人的房屋地址
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e1790b2b5d
								
							
								
							
						 | 
						
							
							
								
								注释
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								91bf84654a
								
							
								
							
						 | 
						
							
							
								
								bugfix
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								17df75d84d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_demand_service_stats' into dev_ic_mp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b8aba44836
								
							
								
							
						 | 
						
							
							
								
								【事件】(未处理、处理中、已办结)地图、列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								47559f3715
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								58ef2d14da
								
							
								
							
						 | 
						
							
							
								
								需求大厅
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								35d9cd2185
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_demand_service_stats
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								742282a219
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.志愿者需求服务统计。以网格为维度统计。
2.志愿者分页查询。增加上级agencyId为条件,查询该agencyId下n级所有的志愿者
3.志愿者分布查询。增加agencyId为条件,查询该agencyId下n级所有的志愿者.
4.志愿者需求服务统计结果查询。增加agencyId为条件,查询该agencyId下n级所有的服务统计信息。 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								51154424c7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago |