|  zxc | 14b492e2b1 | 议题转项目 + gridId | 4 years ago | 
				
					
						|  yinzuomei | d8158f08bf | color | 4 years ago | 
				
					
						|  yinzuomei | 27e0a7d30a | Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili | 4 years ago | 
				
					
						|  yinzuomei | a8c6142dcb | 分类饼1 | 4 years ago | 
				
					
						|  sunyuchao | 2395fb7af2 | 事件管理_评价 | 4 years ago | 
				
					
						|  yinzuomei | df6803b14f | Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili # Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java | 4 years ago | 
				
					
						|  yinzuomei | 5a182abf8a | 分类饼1 | 4 years ago | 
				
					
						|  zxc | 429c677f65 | xiangmu列表 | 4 years ago | 
				
					
						|  sunyuchao | 820f558278 | 事件管理_立项、转需求 | 4 years ago | 
				
					
						|  zxc | e083ad76c4 | 列表 | 4 years ago | 
				
					
						|  zxc | 148e77e618 | 报事-立项 新增网格ID | 4 years ago | 
				
					
						|  zxc | 334e69b361 | 协办单位 | 4 years ago | 
				
					
						|  zxc | 943ffcff81 | 项目列表微调 | 4 years ago | 
				
					
						|  jianjun | a95f4aca9e | Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili | 4 years ago | 
				
					
						|  jianjun | 5e47e6b315 | bug | 4 years ago | 
				
					
						|  sunyuchao | 3e8b89a942 | Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili # Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java | 4 years ago | 
				
					
						|  sunyuchao | f632735c77 | 事件管理_回复 | 4 years ago | 
				
					
						|  zxc | 8eb0ed5dd9 | 引包修改 | 4 years ago | 
				
					
						|  wangxianzhang | a635d3d7fb | Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili  Conflicts:
	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java | 4 years ago | 
				
					
						|  wangxianzhang | 18fda9352b | 新增:事件处理分析-月增量查询 | 4 years ago | 
				
					
						|  yinzuomei | 8988a219c5 | Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili | 4 years ago | 
				
					
						|  yinzuomei | 11914ecb2c | duoyuan | 4 years ago | 
				
					
						|  sunyuchao | cab37cae7e | Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili | 4 years ago | 
				
					
						|  sunyuchao | 96e7242dcb | Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili | 4 years ago | 
				
					
						|  yinzuomei | 2e6fd2b31f | Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili | 4 years ago | 
				
					
						|  sunyuchao | d6b1f0e7e7 | 事件管理_新增 | 4 years ago | 
				
					
						|  yinzuomei | 06d0d73ad1 | duoyuan | 4 years ago | 
				
					
						|  yinzuomei | abea2ee464 | duoyuan | 4 years ago | 
				
					
						|  zxc | 3115775f62 | 协办单位列表 | 4 years ago | 
				
					
						|  zxc | 03590577ec | 是否处理 | 4 years ago | 
				
					
						|  yinzuomei | 65504d06a0 | Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili | 4 years ago | 
				
					
						|  yinzuomei | a73101fe1b | 暂存 | 4 years ago | 
				
					
						|  sunyuchao | b6e8ec88b5 | 事件管理_新增 | 4 years ago | 
				
					
						|  sunyuchao | 9363d7e3fd | Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili # Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
#	epmet-module/gov-project/gov-project-server/pom.xml
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java | 4 years ago | 
				
					
						|  zxc | 28e317b39f | 分页 | 4 years ago | 
				
					
						|  zxc | f2195b56c0 | 满意度评价列表 | 4 years ago | 
				
					
						|  wangxianzhang | a3ba7a793f | Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili | 4 years ago | 
				
					
						|  wangxianzhang | 7ea5371a5b | 新增:事件处理分析-事件列表 修改:时间处理分析-事件饼图 | 4 years ago | 
				
					
						|  yinzuomei | 38f985fda7 | 社区自组织添加分类,导入导出新增修改列表已添加 | 4 years ago | 
				
					
						|  zxc | 624f417fce | 列表添加条件 | 4 years ago | 
				
					
						|  yinzuomei | 7fb1c0b8af | Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili | 4 years ago | 
				
					
						|  yinzuomei | 225d1fe5bb | 社区自组织添加分类,导入导出新增修改列表已添加 | 4 years ago | 
				
					
						|  zxc | a53c16f918 | 项目关闭,流转,响应添加协办单位 | 4 years ago | 
				
					
						|  wangxianzhang | 91495e5180 | Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili  Conflicts:
	epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java | 4 years ago | 
				
					
						|  wangxianzhang | 68a27f1c68 | 新增:事件处理分析-处理状态比例查询完成 | 4 years ago | 
				
					
						|  zxc | 74b68302ed | 项目立项+报事-立项新增网格ID,协办单位, 报事-立项有个TODO | 4 years ago | 
				
					
						|  sunyuchao | 1f1f93dbd7 | 事件管理_列表 | 4 years ago | 
				
					
						|  zxc | 6a3d4c9c91 | 项目process微调 | 4 years ago | 
				
					
						|  yinzuomei | 41b9029388 | Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili | 4 years ago | 
				
					
						|  yinzuomei | ec6d243707 | 社区自组织添加分类 | 4 years ago |