zxc
							
						 | 
						
							
							
							
								
							
								cc6333cc46
								
							
								
							
						 | 
						
							
							
								
								房屋信息增加新的查询条件
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4f06cbdc05
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								75cebe497d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								a2bcf00622
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix_resiimport_agencyerror'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								35c2d917cd
								
							
								
							
						 | 
						
							
							
								
								修改生成代码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								58d959362c
								
							
								
							
						 | 
						
							
							
								
								居民信息修改 bug修复
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c547f89630
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_zhili'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								17073a1498
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								35fb00e189
								
							
								
							
						 | 
						
							
							
								
								sql
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								891aae733a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into bugfix_resiimport_agencyerror
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0fd601fd4a
								
							
								
							
						 | 
						
							
							
								
								服务项目微调附件字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3dfe378ae0
								
							
								
							
						 | 
						
							
							
								
								服务项目微调附件字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								aa1c85c2a2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_party_mange'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								c05a338fbb
								
							
								
							
						 | 
						
							
							
								
								修改:【服务项目】服务记录列表增加ID的返回
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								27e2ad1f33
								
							
								
							
						 | 
						
							
							
								
								协办单位微调
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								6fbfe43ffc
								
							
								
							
						 | 
						
							
							
								
								新增:【服务项目】新增提交服务反馈接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								679afd76cd
								
							
								
							
						 | 
						
							
							
								
								fly位置错误
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								dddc7d8342
								
							
								
							
						 | 
						
							
							
								
								fly名称修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								f2df81452f
								
							
								
							
						 | 
						
							
							
								
								flyway脚本
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								3cbb8349fc
								
							
								
							
						 | 
						
							
							
								
								代码生成
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								798cbc69a9
								
							
								
							
						 | 
						
							
							
								
								同步原型图
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								f08ccb7512
								
							
								
							
						 | 
						
							
							
								
								到处判断
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								a1e979db02
								
							
								
							
						 | 
						
							
							
								
								【服务项目】发起服务接口-第一次完善
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								59709ee239
								
							
								
							
						 | 
						
							
							
								
								根据身份证判断居民在小程序端是否是志愿者
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								468fc146c8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_zhili'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								a3cc07497f
								
							
								
							
						 | 
						
							
							
								
								【服务项目】新增发起项目接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								bbfcb88f7b
								
							
								
							
						 | 
						
							
							
								
								增加合计
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								b04805b471
								
							
								
							
						 | 
						
							
							
								
								完善导出
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								85c48ee54b
								
							
								
							
						 | 
						
							
							
								
								根据身份证判断居民在小程序端是否是志愿者
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								3727208391
								
							
								
							
						 | 
						
							
							
								
								调整统计的结果
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								11ca6505d5
								
							
								
							
						 | 
						
							
							
								
								detail
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								39b123f0e2
								
							
								
							
						 | 
						
							
							
								
								新增:【服务项目】服务记录列表查询
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								0397fc16e0
								
							
								
							
						 | 
						
							
							
								
								sql调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								76dbe9aecd
								
							
								
							
						 | 
						
							
							
								
								无日期查询当日
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								6ff124cd4a
								
							
								
							
						 | 
						
							
							
								
								【居民信息导入】AGENCY_ID应该取所属网格的上级,而不是从当前登录人员的agencyId中取
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								39e63ea06f
								
							
								
							
						 | 
						
							
							
								
								服务项目
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								985b257a17
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2053cd7eb0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_party_mange'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								5d842bacc6
								
							
								
							
						 | 
						
							
							
								
								完善页面查询
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								b783eb4b01
								
							
								
							
						 | 
						
							
							
								
								修改统计逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								77fc8e3e24
								
							
								
							
						 | 
						
							
							
								
								党员相关bug修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e025323419
								
							
								
							
						 | 
						
							
							
								
								服务项目详情加了个级别
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a21ecb1ef9
								
							
								
							
						 | 
						
							
							
								
								服务项目详情加了个级别
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								c3ec06ec2c
								
							
								
							
						 | 
						
							
							
								
								网格判断del=0
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d6b5fb9766
								
							
								
							
						 | 
						
							
							
								
								更新flyaway,删除经纬度逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								f20dcaa5f5
								
							
								
							
						 | 
						
							
							
								
								删除IcVolunteerPolyCategory表经纬度
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								600097ae28
								
							
								
							
						 | 
						
							
							
								
								服务项目详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								43bcadeffc
								
							
								
							
						 | 
						
							
							
								
								dim表筛选数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								73c382d6b7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_party_mange'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								0b4a05af31
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_icservice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_icservice
							
							
							
							
								
							
							
						 | 
						3 years ago |