zxc
							
						 | 
						
							
							
							
								
							
								2e0263fa35
								
							
								
							
						 | 
						
							
							
								
								remark
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								a139a36a55
								
							
								
							
						 | 
						
							
							
								
								添加量化积分统计的逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								085ba12372
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								b0b5b6ee95
								
							
								
							
						 | 
						
							
							
								
								服务记录列表屏蔽已取消的
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								aa2142491a
								
							
								
							
						 | 
						
							
							
								
								新增修改逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								a183ef5e4f
								
							
								
							
						 | 
						
							
							
								
								修改set字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d6052e66c0
								
							
								
							
						 | 
						
							
							
								
								楼栋基本信息详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								846a8a281b
								
							
								
							
						 | 
						
							
							
								
								空指针修复
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								4e444ad84f
								
							
								
							
						 | 
						
							
							
								
								各种分页接口以及补充注释
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								e380c42342
								
							
								
							
						 | 
						
							
							
								
								出租房信息分页接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								6e954ca9d1
								
							
								
							
						 | 
						
							
							
								
								修改:【居民信息导入】所属支部的查询调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								22b6ecc167
								
							
								
							
						 | 
						
							
							
								
								平房分页接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								76fc621b46
								
							
								
							
						 | 
						
							
							
								
								分页接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								6860ef2fd8
								
							
								
							
						 | 
						
							
							
								
								分页接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								53fc5eb722
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/statistical_zhy'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								3be8476f5d
								
							
								
							
						 | 
						
							
							
								
								防止空指针
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								04b39e1768
								
							
								
							
						 | 
						
							
							
								
								判断
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d7b3dc1171
								
							
								
							
						 | 
						
							
							
								
								默认值0等等改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								1549134785
								
							
								
							
						 | 
						
							
							
								
								发起服务,没有feedback默认服务状态
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								96a1ee758d
								
							
								
							
						 | 
						
							
							
								
								分页接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								eb05d02cf1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/statistical_zhy'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								30d003bad5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_icservice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_icservice
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								64875de03c
								
							
								
							
						 | 
						
							
							
								
								修改:同一个项目暂时不做服务次数限制
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								63efac033c
								
							
								
							
						 | 
						
							
							
								
								修改判断逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								3890c7da3e
								
							
								
							
						 | 
						
							
							
								
								调整合计的位置
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								bacb611129
								
							
								
							
						 | 
						
							
							
								
								我的家庭相关代码文件
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1e332de4fc
								
							
								
							
						 | 
						
							
							
								
								楼栋单元数修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								f846648ee3
								
							
								
							
						 | 
						
							
							
								
								修改统计逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								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 |