jianjun
							
						 | 
						
							
							
							
								
							
								bcf337a086
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								68bc5121bb
								
							
								
							
						 | 
						
							
							
								
								项目详情返回 上报人角色集合及ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8e4c9120d4
								
							
								
							
						 | 
						
							
							
								
								角色添加 , 编辑时 添加缓存逻辑
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1c13f2405b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								b75757b77b
								
							
								
							
						 | 
						
							
							
								
								网格员巡查 错误消息
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								978dd5fb32
								
							
								
							
						 | 
						
							
							
								
								批量查询改单个
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4c958a910b
								
							
								
							
						 | 
						
							
							
								
								更名
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								884762592b
								
							
								
							
						 | 
						
							
							
								
								角色查询
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								eaacc3ca9d
								
							
								
							
						 | 
						
							
							
								
								补录数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3b73fefaa5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4f0f60c63b
								
							
								
							
						 | 
						
							
							
								
								代码调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								440024cb0b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6c108a5441
								
							
								
							
						 | 
						
							
							
								
								漏提代码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								296c8916c0
								
							
								
							
						 | 
						
							
							
								
								screen_project_data添加上报人ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ccf4cab5bf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e51f508864
								
							
								
							
						 | 
						
							
							
								
								更多-巡查列表接口逻辑调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								20291e71a4
								
							
								
							
						 | 
						
							
							
								
								screen_project_data添加上报人ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fb327ddd54
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_wxz_gateway_access' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								68b2ca86bd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev_wxz_gateway_access
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a2f7084122
								
							
								
							
						 | 
						
							
							
								
								修复:用户的登录缓存删除之后,继续操作,提示无权限的问题
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								17819742d1
								
							
								
							
						 | 
						
							
							
								
								网格员巡查功能接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								330e6cd4d0
								
							
								
							
						 | 
						
							
							
								
								网格员巡查功能接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b3cbdf09db
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								14b27f8940
								
							
								
							
						 | 
						
							
							
								
								采用lambda方式 创建sql
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7fc4ffbe2d
								
							
								
							
						 | 
						
							
							
								
								网格员巡查功能接口权限
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d7b286457f
								
							
								
							
						 | 
						
							
							
								
								注释添加
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								baa3bff6e4
								
							
								
							
						 | 
						
							
							
								
								巡查按钮权限 添加
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								03ceb87cee
								
							
								
							
						 | 
						
							
							
								
								更多-巡查列表接口添加权限
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d1bd137eb7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev_log
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a831a8f01e
								
							
								
							
						 | 
						
							
							
								
								修改 权限模块
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								62fac84c19
								
							
								
							
						 | 
						
							
							
								
								网格员巡查功能接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								cb20477209
								
							
								
							
						 | 
						
							
							
								
								网格员巡查功能接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								5231b71caa
								
							
								
							
						 | 
						
							
							
								
								网格员巡查功能接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								cf238e3ac2
								
							
								
							
						 | 
						
							
							
								
								日志列增加customer_id列
							
							
							
							
							
							
								
							
							
							日志查询接口,改为模糊查询 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								de9906547a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev_log
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-admin/epmet-admin-server/pom.xml
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
#	epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3a3a2caba4
								
							
								
							
						 | 
						
							
							
								
								网格员轨迹查询 经纬度修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								865c1c302d
								
							
								
							
						 | 
						
							
							
								
								将开发环境原有的namespace替换为新开发环境的namespace
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d91fa2bc84
								
							
								
							
						 | 
						
							
							
								
								将130相关的配置替换为140
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8bdfb15015
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_grid_patrol' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6b3f6975f5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b3bc252be7
								
							
								
							
						 | 
						
							
							
								
								加强判断
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4fc06e20b0
								
							
								
							
						 | 
						
							
							
								
								sql脚本删除
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								44f78840e4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_grid_patrol' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c3d18a9425
								
							
								
							
						 | 
						
							
							
								
								网格员巡查功能接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c1578883fd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_grid_patrol' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ff7f725c86
								
							
								
							
						 | 
						
							
							
								
								网格员巡查功能接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d09771f5d7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_grid_patrol' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d22e851529
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_grid_patrol
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2c711d6039
								
							
								
							
						 | 
						
							
							
								
								日志bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a2f6ece50d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_project_location
							
							
							
							
								
							
							
						 | 
						4 years ago |