zhangyuan
							
						 | 
						
							
							
							
								
							
								741e15b7d1
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								ac7fc2032b
								
							
								
							
						 | 
						
							
							
								
								【报表】增加AOP拦截器,和对应的注解,用于拦截url参数,给具有@RequestBody注解的入参赋值
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								5845ebe6bb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/visitor_zhy'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								6bcca8cb4d
								
							
								
							
						 | 
						
							
							
								
								ddd
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								3cdb180a7d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jmreport
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								217e299291
								
							
								
							
						 | 
						
							
							
								
								【报表】增加AOP拦截器,和对应的注解,用于拦截url参数,给具有@RequestBody注解的入参赋值
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a391d13fae
								
							
								
							
						 | 
						
							
							
								
								编辑暂提
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4156c3648b
								
							
								
							
						 | 
						
							
							
								
								删除没用的
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								353a5e45a6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_jmreport' into dev_jmreport
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcCustomerReportController.java
#	epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcCustomerReportService.java
#	epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e2ed87a469
								
							
								
							
						 | 
						
							
							
								
								功能类别字典
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								b03bea4745
								
							
								
							
						 | 
						
							
							
								
								居民信息采集详情添加社区id
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								dc83916024
								
							
								
							
						 | 
						
							
							
								
								名字
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								345c885dac
								
							
								
							
						 | 
						
							
							
								
								列表
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cdd85d9346
								
							
								
							
						 | 
						
							
							
								
								暂提
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								6f6c112157
								
							
								
							
						 | 
						
							
							
								
								【报表】增加commons-feignclient模块,用于调用报表服务
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								efbe5ef9d6
								
							
								
							
						 | 
						
							
							
								
								项目处理进展增加内部备注、处理中的附件等信息的返参
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c2a8f641ad
								
							
								
							
						 | 
						
							
							
								
								代码生成
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								ec5b28c8f9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								bf8cc12283
								
							
								
							
						 | 
						
							
							
								
								信息采集审核
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								471aa20811
								
							
								
							
						 | 
						
							
							
								
								调整数据库脚本版本号
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								ea995d0d0a
								
							
								
							
						 | 
						
							
							
								
								ggg
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1bed7d8884
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bug_select_staff'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b8651d565e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_ic_user_match_grid'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								06ce0211b7
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4456ea5d55
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								a825c96b24
								
							
								
							
						 | 
						
							
							
								
								还原
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f9b5c74ddb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b0db08200a
								
							
								
							
						 | 
						
							
							
								
								新增部门
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								863b10523c
								
							
								
							
						 | 
						
							
							
								
								shandiao
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								9a4fa92cc2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_project_hd_syc'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								0c543dd1cc
								
							
								
							
						 | 
						
							
							
								
								应杨坤要求项目管理列表和导出的图片展示创建节点和结案节点的图片
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								c768ba966f
								
							
								
							
						 | 
						
							
							
								
								补充数据库脚本;删除IS_PARTY字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								945d6b602a
								
							
								
							
						 | 
						
							
							
								
								?
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								b0ae123722
								
							
								
							
						 | 
						
							
							
								
								试试
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								d6cd3e1fab
								
							
								
							
						 | 
						
							
							
								
								下载社区码调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7df0589a97
								
							
								
							
						 | 
						
							
							
								
								添加客户ID
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a708356bb2
								
							
								
							
						 | 
						
							
							
								
								加白名单 略改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								b145fea023
								
							
								
							
						 | 
						
							
							
								
								试试
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								87b84239a3
								
							
								
							
						 | 
						
							
							
								
								信息采集审核
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								0f86f1d437
								
							
								
							
						 | 
						
							
							
								
								信息采集审核
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								fc33938ce5
								
							
								
							
						 | 
						
							
							
								
								试试
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								228151f933
								
							
								
							
						 | 
						
							
							
								
								匹配身份证
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								ac2792bb7f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_project_hd_syc'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								04585fb546
								
							
								
							
						 | 
						
							
							
								
								信息采集审核
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								09b06d3300
								
							
								
							
						 | 
						
							
							
								
								冗余
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6e808cf108
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_project_process'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								b89c1074f0
								
							
								
							
						 | 
						
							
							
								
								处理进展添加工作人员姓名
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c0ce8983cb
								
							
								
							
						 | 
						
							
							
								
								处理进展添加工作人员姓名
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								87cfb78b86
								
							
								
							
						 | 
						
							
							
								
								信息采集审核
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								9fe292927c
								
							
								
							
						 | 
						
							
							
								
								信息采集审核
							
							
							
							
								
							
							
						 | 
						3 years ago |