jianjun
							
						 | 
						
							
							
							
								
							
								26e259c5af
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2d64a43b82
								
							
								
							
						 | 
						
							
							
								
								获取网格基础信息接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bf9bd49d2c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1ca7460013
								
							
								
							
						 | 
						
							
							
								
								获取网格基础信息接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								60d90ea9ce
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_temp' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								fff8c88984
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7a623cf1e0
								
							
								
							
						 | 
						
							
							
								
								获取网格基础信息接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								93ce9becdd
								
							
								
							
						 | 
						
							
							
								
								列名修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b3e6c154f7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								726db623dc
								
							
								
							
						 | 
						
							
							
								
								列名修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3b2efc5990
								
							
								
							
						 | 
						
							
							
								
								小组通知代码生成
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8c394f2d4d
								
							
								
							
						 | 
						
							
							
								
								改为okhttp试试 看看是否还超时
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								78dc00de47
								
							
								
							
						 | 
						
							
							
								
								代码初始提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1c1342e555
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_project_approval' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1c49996f52
								
							
								
							
						 | 
						
							
							
								
								项目立项添加操作权限
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ebfa49c6cc
								
							
								
							
						 | 
						
							
							
								
								项目立项标题20字
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ead9dbf83d
								
							
								
							
						 | 
						
							
							
								
								调整调用第三方日志
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2df8a2d460
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								54106eccd3
								
							
								
							
						 | 
						
							
							
								
								agencyDetail
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bf753487ff
								
							
								
							
						 | 
						
							
							
								
								agencyDetail
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e11dd84e56
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3d7e1af75c
								
							
								
							
						 | 
						
							
							
								
								修改组织信息
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d8dc65eff9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								347687e0ae
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ff7a5bed55
								
							
								
							
						 | 
						
							
							
								
								departmentdetail
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7651da3361
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								0a5192efc0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4029959dfc
								
							
								
							
						 | 
						
							
							
								
								"agencydetail"修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								54ea358ec4
								
							
								
							
						 | 
						
							
							
								
								业务域名改为非必填
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								580d0df7ad
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_report_bugfix' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								61dbe2c30a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fe69f95eb5
								
							
								
							
						 | 
						
							
							
								
								添加区编码修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c50c132dcf
								
							
								
							
						 | 
						
							
							
								
								难点堵点-查询列表 如果内容为空则返回标题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								34de2cb138
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_project_approval' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java 
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2cfcc115df
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_flyway_scripts' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago |