yinzuomei
							
						 | 
						
							
							
							
								
							
								6e877cda21
								
							
								
							
						 | 
						
							
							
								
								resi_event.pids varchar(255)
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								db26848fbd
								
							
								
							
						 | 
						
							
							
								
								用户邀请关系bugfix
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f88cfb1908
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f1b87860d4
								
							
								
							
						 | 
						
							
							
								
								个人中心未读、已读
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								30807755a4
								
							
								
							
						 | 
						
							
							
								
								报事
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								533a30a6f1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e9ba326ede
								
							
								
							
						 | 
						
							
							
								
								hebing
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e24c661d2a
								
							
								
							
						 | 
						
							
							
								
								和代码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6c040539f9
								
							
								
							
						 | 
						
							
							
								
								resi_event修改is_party类型为tinyint(1)
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5437d7a12f
								
							
								
							
						 | 
						
							
							
								
								resi_event新增close_case_time办结时间
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								379eb16df7
								
							
								
							
						 | 
						
							
							
								
								报事?
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ce2fd48943
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_healthcheck' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5e9e4a26b8
								
							
								
							
						 | 
						
							
							
								
								删掉多余健康检查Controller
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9a97cf6dd9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_resi_event' into develop
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f9ac0ce789
								
							
								
							
						 | 
						
							
							
								
								新增:上传报事文件接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								22e8d4bf6b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a665b9f1e0
								
							
								
							
						 | 
						
							
							
								
								新增:报事-可上报的目标级别列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7edea317ef
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ed46482948
								
							
								
							
						 | 
						
							
							
								
								data-agg:个人中心是否显示@我
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								52d917f4b5
								
							
								
							
						 | 
						
							
							
								
								位置改动
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e869adc73f
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								42cb5d2af0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7693814bf0
								
							
								
							
						 | 
						
							
							
								
								暂存提交下
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cc7b6d4a2d
								
							
								
							
						 | 
						
							
							
								
								接口框
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								da4c6b7429
								
							
								
							
						 | 
						
							
							
								
								抓紧提交 不合代码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								33bc6098ab
								
							
								
							
						 | 
						
							
							
								
								emm 赶紧提交 省着和代码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7ea91ecdcb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_resi_event' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_event
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								0f003b38ad
								
							
								
							
						 | 
						
							
							
								
								新增:我要报事-查询人大代表列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								63641531e8
								
							
								
							
						 | 
						
							
							
								
								resieventreply
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ad21a4eea5
								
							
								
							
						 | 
						
							
							
								
								tinyint(1)=>Boolean
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								16345ea5ae
								
							
								
							
						 | 
						
							
							
								
								代码生成提交,只放了事件和回复两个主表的controller
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d154c172b2
								
							
								
							
						 | 
						
							
							
								
								新增resi_event_XXX表,建表语句
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								973948cd41
								
							
								
							
						 | 
						
							
							
								
								增加报事的controller,service
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								88d83c9c19
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								503e4f1ecf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7a528c5fa2
								
							
								
							
						 | 
						
							
							
								
								告警时间转换错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								99e2ce1be9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c8e013f936
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ui_upgrade' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								034015f4f7
								
							
								
							
						 | 
						
							
							
								
								>8000的错误码提示给用户。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1430b764bb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_ui_upgrade' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								8026023c5b
								
							
								
							
						 | 
						
							
							
								
								积分排行UI变更设计,添加头像
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9bbfc7c2d4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_healthcheck' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								445c1d6f23
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_healthcheck
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								378f57dceb
								
							
								
							
						 | 
						
							
							
								
								增加健康检查controller
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								88fac1c729
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1efc81fab5
								
							
								
							
						 | 
						
							
							
								
								治理指数-网格fact_grid_govern_daily抽取失败bugfix
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ad9d706b0b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_bug_pagehelper' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								36e273a96b
								
							
								
							
						 | 
						
							
							
								
								调整PageHelper.startpage()位置,防止线程变量残留问题
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								97b6f5e34e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								89d915ab9d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago |