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
							
						 | 
						
							
							
							
								
							
								52add5bde1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_area_code' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9df85e7e4a
								
							
								
							
						 | 
						
							
							
								
								新增组织V2接口提交
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f2c489bd69
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_project_approval' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e3859f1f13
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_temp' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								af4e5489b4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_openapi' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java 
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7a1c7ad30a
								
							
								
							
						 | 
						
							
							
								
								项目主表 gridId添加默认值为emptyString
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8e8590ae49
								
							
								
							
						 | 
						
							
							
								
								项目详情接口添加返参
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								407885da53
								
							
								
							
						 | 
						
							
							
								
								项目主表 数据脚本
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								11574ab7b7
								
							
								
							
						 | 
						
							
							
								
								项目立项
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								3c9650f61b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_isDomainName' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								e69aa0f838
								
							
								
							
						 | 
						
							
							
								
								[定制功能 ] 表增加IS_DOMAIN_NAME字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b237654f1d
								
							
								
							
						 | 
						
							
							
								
								agencydetail 新增返参areaName
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ab371e04ec
								
							
								
							
						 | 
						
							
							
								
								备注添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								95401d69e7
								
							
								
							
						 | 
						
							
							
								
								网格办结项目数修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								46d849f087
								
							
								
							
						 | 
						
							
							
								
								组织机构新增area_code,db相关修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a44cca13c4
								
							
								
							
						 | 
						
							
							
								
								新增customer_org_parameter;修改/gov/org/agency/agencydetail接口,修改添加网格
							
							
							
							
							
							
								
							
							
							添加部门接口 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7ab3abc555
								
							
								
							
						 | 
						
							
							
								
								项目主表添加数据来源
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1372bffd2f
								
							
								
							
						 | 
						
							
							
								
								项目主表网格相关sql修改,主表数据提取修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5a6c46bb57
								
							
								
							
						 | 
						
							
							
								
								网格自治项目数修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a3d55ef428
								
							
								
							
						 | 
						
							
							
								
								组织机构新增area_code,db相关修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8b54ac2738
								
							
								
							
						 | 
						
							
							
								
								项目立项project表添加字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e71ca4ca8b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_0409yzm' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f60575c8c9
								
							
								
							
						 | 
						
							
							
								
								项目立项project表添加字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								765a15d679
								
							
								
							
						 | 
						
							
							
								
								项目立项db调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								eeee230cb0
								
							
								
							
						 | 
						
							
							
								
								添加注释
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ca659b6d97
								
							
								
							
						 | 
						
							
							
								
								项目立项-可选组织树查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								18c8d2aa7d
								
							
								
							
						 | 
						
							
							
								
								代码微调
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								b34912b465
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								6ceb2eca49
								
							
								
							
						 | 
						
							
							
								
								第三方平台-接口
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								894dd33d5d
								
							
								
							
						 | 
						
							
							
								
								修改:参数校验,打印error改为打印warn
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								bf9ba642b0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bug_2021408' into dev_temp
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
#	epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								fcd2092c73
								
							
								
							
						 | 
						
							
							
								
								列表展示,当前用户,在当前客户下访问过的网格bug
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								74bab40993
								
							
								
							
						 | 
						
							
							
								
								日志级别调整
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a2387f1980
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_visit_group' into dev_temp
							
							
							
							
								
							
							
						 | 
						5 years ago |