zxc
							
						 | 
						
							
							
							
								
							
								d6c2cf55fe
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								daf257506c
								
							
								
							
						 | 
						
							
							
								
								基础数据上报 部分接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ebfef35c6e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_fusion
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-gateway/src/main/resources/bootstrap.yml 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5d7054c65d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_patrol_count' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c289d02970
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0679a24421
								
							
								
							
						 | 
						
							
							
								
								添加日志 用户未登录异常
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b25781f844
								
							
								
							
						 | 
						
							
							
								
								/gov/mine/agency/getlatestcustomer返参增加haveSubCustomer、subCustomerIds
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4baf1408f6
								
							
								
							
						 | 
						
							
							
								
								SATISFACTION_SCORE修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d203cfea9e
								
							
								
							
						 | 
						
							
							
								
								大屏网格员列表返回手机号(org,user,report)代码微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ff85e01f2e
								
							
								
							
						 | 
						
							
							
								
								难点赌点列表:difficultyrank-multic
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ead5b4ea62
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_oper_role' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								498c9dd692
								
							
								
							
						 | 
						
							
							
								
								14个基础数据上报接口模板
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								dfa7c80111
								
							
								
							
						 | 
						
							
							
								
								大屏网格员列表返回手机号(org,user,report)
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								672662f04e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8973ce412e
								
							
								
							
						 | 
						
							
							
								
								难点赌点列表:difficultyrank-multic
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f74080fb3b
								
							
								
							
						 | 
						
							
							
								
								网格员巡查功能接口bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f656bd9c43
								
							
								
							
						 | 
						
							
							
								
								gataway拦截 point请求 mqcallback 放行
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								da71725a8c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_patrol_count' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								57e78be08b
								
							
								
							
						 | 
						
							
							
								
								难点堵点-组织下拉框"mynextagency-multic"v2
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								392b75c355
								
							
								
							
						 | 
						
							
							
								
								更多-巡查记录列表可查看当前组织及下级所有网格列表下数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								45a9dd7c37
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c2837745c3
								
							
								
							
						 | 
						
							
							
								
								难点堵点-组织下拉框"mynextagency-multic"
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7d13637747
								
							
								
							
						 | 
						
							
							
								
								孔村,榆山,锦水pid更为平阴
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0738a81aee
								
							
								
							
						 | 
						
							
							
								
								dto位置
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c6656f8a3e
								
							
								
							
						 | 
						
							
							
								
								巡查中和未巡查中人数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								06b6982b44
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_avg_samplecount' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d9a013697a
								
							
								
							
						 | 
						
							
							
								
								为多客户情况下的计算,增加平均值指标参与计算数量的字段
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7d0332212c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								5af2524824
								
							
								
							
						 | 
						
							
							
								
								治理能力排行数据统计逻辑修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2783dab148
								
							
								
							
						 | 
						
							
							
								
								修复:平均值计算,没有生成sample_count的bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ae2e9762ce
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								211018e5dd
								
							
								
							
						 | 
						
							
							
								
								批量保存改单条
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bedb210560
								
							
								
							
						 | 
						
							
							
								
								启动页sql脚本
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9c6e95c365
								
							
								
							
						 | 
						
							
							
								
								接口调整 客户没有设置启动页赋值默认值
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7f41a1c36d
								
							
								
							
						 | 
						
							
							
								
								指标说明去掉含义 二字
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								514bf41cee
								
							
								
							
						 | 
						
							
							
								
								启动页查询接口不需要token
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								60979307ec
								
							
								
							
						 | 
						
							
							
								
								启动页配置接口首次提交
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0ac12510c8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f063738018
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								117c6c82c2
								
							
								
							
						 | 
						
							
							
								
								网格员巡查记录bug修复
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4775db3f16
								
							
								
							
						 | 
						
							
							
								
								基层治理 响应率自治率统计修改
							
							
							
							
							
							
								
							
							
							小组积分排行入参验证 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								157443077b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_trace_id' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8b5f2d14a5
								
							
								
							
						 | 
						
							
							
								
								添加TraceID(Transaction-Serial)的时候,如果nginx已经生成了该header,则直接用nginx的
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6ab7c7f7c1
								
							
								
							
						 | 
						
							
							
								
								代码优化 bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								640710220b
								
							
								
							
						 | 
						
							
							
								
								注释添加
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bd83017dc8
								
							
								
							
						 | 
						
							
							
								
								修改mq listener注册方式,弃用注解注册
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								88eb05c07b
								
							
								
							
						 | 
						
							
							
								
								孔村、锦水、榆山的 orgType 微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								dbc1efd516
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								af784664cb
								
							
								
							
						 | 
						
							
							
								
								左链接添加限制条件
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								673bb4d1b7
								
							
								
							
						 | 
						
							
							
								
								修改:系统日志列表增加权限控制注解
							
							
							
							
								
							
							
						 | 
						4 years ago |