yinzuomei
							
						 | 
						
							
							
							
								
							
								54106eccd3
								
							
								
							
						 | 
						
							
							
								
								agencyDetail
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bf753487ff
								
							
								
							
						 | 
						
							
							
								
								agencyDetail
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3d7e1af75c
								
							
								
							
						 | 
						
							
							
								
								修改组织信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8d647eab78
								
							
								
							
						 | 
						
							
							
								
								修改组织信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d6b180806f
								
							
								
							
						 | 
						
							
							
								
								事件分析 org-月 统计
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								efcf6d4d2a
								
							
								
							
						 | 
						
							
							
								
								agencydetail接口膝盖,areaName返回空字符串not null
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5e410685a9
								
							
								
							
						 | 
						
							
							
								
								请选择组织区划重复提示
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ddafed7302
								
							
								
							
						 | 
						
							
							
								
								项目分析 统计直接立项查询 gridId修改 = ''
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5f1930356c
								
							
								
							
						 | 
						
							
							
								
								项目分类统计直接立项查询 gridId修改 = ''
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								07274e5dc0
								
							
								
							
						 | 
						
							
							
								
								事件分析单/多客户暂时分开,【org-月】
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4b61d8920a
								
							
								
							
						 | 
						
							
							
								
								事件分析单/多客户暂时分开,【org-天】
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ff7a5bed55
								
							
								
							
						 | 
						
							
							
								
								departmentdetail
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								017bf883dc
								
							
								
							
						 | 
						
							
							
								
								新增组织V2接口提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								77a21116a4
								
							
								
							
						 | 
						
							
							
								
								难点堵点图片 设置customerId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3b7bc9a8d8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into dev_project_approval
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4029959dfc
								
							
								
							
						 | 
						
							
							
								
								"agencydetail"修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								54ea358ec4
								
							
								
							
						 | 
						
							
							
								
								业务域名改为非必填
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fe69f95eb5
								
							
								
							
						 | 
						
							
							
								
								添加区编码修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c50c132dcf
								
							
								
							
						 | 
						
							
							
								
								难点堵点-查询列表 如果内容为空则返回标题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								41032cf2f6
								
							
								
							
						 | 
						
							
							
								
								项目立项 内部备注必填
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								edaeb3c063
								
							
								
							
						 | 
						
							
							
								
								难点堵点-定时抽取
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								318ecb2e18
								
							
								
							
						 | 
						
							
							
								
								del_flag='0'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b674b20bfd
								
							
								
							
						 | 
						
							
							
								
								项目分类 org 多客户修改【同单客户一样】
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ff4f5ffc70
								
							
								
							
						 | 
						
							
							
								
								难点堵点-项目分类
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								533e51254d
								
							
								
							
						 | 
						
							
							
								
								项目分类 org 单客户修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b3c891ae5b
								
							
								
							
						 | 
						
							
							
								
								项目分类 org 单客户修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ffd3d6252f
								
							
								
							
						 | 
						
							
							
								
								nextlevelareacodelist修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								50554d2216
								
							
								
							
						 | 
						
							
							
								
								"agencydetail"修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								45008813d2
								
							
								
							
						 | 
						
							
							
								
								"editagency"修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2f5efbca71
								
							
								
							
						 | 
						
							
							
								
								难点堵点代码暂存-基本没问题了;还需要调整项目分类
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c4f6d4469c
								
							
								
							
						 | 
						
							
							
								
								"editagency"修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								807c78ccbc
								
							
								
							
						 | 
						
							
							
								
								组织区划:市级列表不展示其他
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								329ea9ba77
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_project_approval' into dev_project_approval
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								77b3266a1e
								
							
								
							
						 | 
						
							
							
								
								项目分类保存接口调整 兼容立项类型项目分类保存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4153d52873
								
							
								
							
						 | 
						
							
							
								
								新增组织V2接口提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4e74c87786
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_openapi' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4a82ca3292
								
							
								
							
						 | 
						
							
							
								
								难点堵点代码暂存
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8f45230cc3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_visit_group' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								89acf1aea3
								
							
								
							
						 | 
						
							
							
								
								组织机构新增area_code,db相关修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9df85e7e4a
								
							
								
							
						 | 
						
							
							
								
								新增组织V2接口提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5186720b1d
								
							
								
							
						 | 
						
							
							
								
								重新添加误删的模块
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3f5e3c665a
								
							
								
							
						 | 
						
							
							
								
								dev分支合到dev_add_customer_id分支
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b53b94cc49
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_add_customer_id' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_add_customer_id
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								065ce35f5e
								
							
								
							
						 | 
						
							
							
								
								事件分析组织-月 统计 微调
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e27fbc3c1a
								
							
								
							
						 | 
						
							
							
								
								修改:openApi验签部分,修改返回提示
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ecb8426bdf
								
							
								
							
						 | 
						
							
							
								
								事件分析组织-天 统计 添加组织立项逻辑
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0556718666
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev_openapi
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								789470302f
								
							
								
							
						 | 
						
							
							
								
								项目立项
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f77163b57d
								
							
								
							
						 | 
						
							
							
								
								组织区划下拉框接口V2
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								588add80cc
								
							
								
							
						 | 
						
							
							
								
								组织区划下拉框接口V1
							
							
							
							
								
							
							
						 | 
						5 years ago |