|  zxc | 1c77abf703 | 删除错误输出 | 5 years ago | 
				
					
						|  zxc | 2a1674c13b | 指标计算优化 | 5 years ago | 
				
					
						|  zhangyongzhangyong | c1e8b0f102 | 补充提交(恢复 feignClient文件内容) | 5 years ago | 
				
					
						|  zhangyongzhangyong | b109e1ceaa | 指标采集、大屏数据采集,所有接口,入参修改; 表数据删除,方式修改 | 5 years ago | 
				
					
						|  jianjun | f5585b4d89 | Revert "去除 parent_agency_id字段,communityScore和agencyScore" This reverts commit d650ef19 | 5 years ago | 
				
					
						|  zxc | d650ef1997 | 去除 parent_agency_id字段,communityScore和agencyScore | 5 years ago | 
				
					
						|  sunyuchao | 0962a48914 | 服务升级 | 5 years ago | 
				
					
						|  sunyuchao | ed57469fc9 | Merge branch 'dev_customize' into dev_temp | 5 years ago | 
				
					
						|  sunyuchao | d62a760ffc | 小程序获取定制功能列表接口调整为一个接口 | 5 years ago | 
				
					
						|  sunyuchao | c855004fbf | 人员调动解决自己不能调动自己的问题 | 5 years ago | 
				
					
						|  zxc | 7aba68f0db | AVG修改 | 5 years ago | 
				
					
						|  wangchao | 90dcfdb966 | data-report +1   -> 63 | 5 years ago | 
				
					
						|  wangchao | 8a06af0e49 | Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp | 5 years ago | 
				
					
						|  wangchao | 507594a1cd | Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data | 5 years ago | 
				
					
						|  zhangyongzhangyong | bbb4bdf762 | 支持跨年 | 5 years ago | 
				
					
						|  wangchao | cbcc5d809d | 大屏接口,查询机关结构从请求头中获取客户Id,如果为空则默认为市北大屏的数据。 | 5 years ago | 
				
					
						|  zhangyongzhangyong | 06753532a0 | 5、下级部门指数排行(安宁数据段用), 如果是月份,取上一个月的数据 | 5 years ago | 
				
					
						|  jianjun | 3d1868b40c | 修改bug | 5 years ago | 
				
					
						|  yinzuomei | 435f60aa97 | Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data | 5 years ago | 
				
					
						|  yinzuomei | 71ac82d7a7 | 修改平均值,保留小数点后6位 | 5 years ago | 
				
					
						|  zhangyongzhangyong | 781f864e18 | 维护枚举 | 5 years ago | 
				
					
						|  sunyuchao | 17f29e9c3f | opercustomize未引入user服务问题  服务升级 | 5 years ago | 
				
					
						|  zhangyongzhangyong | f1ee1b45ee | 5、下级部门指数排行(安宁数据段用) | 5 years ago | 
				
					
						|  sunyuchao | 005c91f80a | Merge branches 'dev' and 'dev_staff_transfer' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_staff_transfer | 5 years ago | 
				
					
						|  sunyuchao | 93f27463a1 | 服务升级 | 5 years ago | 
				
					
						|  sunyuchao | 6095c3a018 | Merge branch 'dev_customize' into dev_temp # Conflicts:
#	epmet-gateway/pom.xml
#	epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
#	epmet-module/data-statistical/data-statistical-server/pom.xml
#	epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.2__dim_ag_add_col_type.sql
#	epmet-module/epmet-ext/epmet-ext-server/pom.xml
#	epmet-module/gov-access/gov-access-server/pom.xml
#	epmet-module/oper-customize/oper-customize-server/pom.xml
#	epmet-user/epmet-user-server/pom.xml | 5 years ago | 
				
					
						|  sunyuchao | 139f64cc77 | 居民端、工作端获取客户定制功能列表接口修改 | 5 years ago | 
				
					
						|  yinzuomei | bd5dab379c | Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data | 5 years ago | 
				
					
						|  sunyuchao | 98c93e8e17 | Merge branches 'dev' and 'dev_customize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_customize | 5 years ago | 
				
					
						|  yinzuomei | 188cc42b2c | 安宁e家新增数据端应用 | 5 years ago | 
				
					
						|  jianjun | 0a0804107d | Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix | 5 years ago | 
				
					
						|  jianjun | 28d19854d0 | Merge remote-tracking branch 'remotes/origin/master' into master_bugfix | 5 years ago | 
				
					
						|  jianjun | 79691f6f44 | 部署reposrt | 5 years ago | 
				
					
						|  jianjun | ea364e3675 | Merge remote-tracking branch 'remotes/origin/dev' | 5 years ago | 
				
					
						|  jianjun | dbfb8c1251 | Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev | 5 years ago | 
				
					
						|  jianjun | ed542f696f | 修改错误 | 5 years ago | 
				
					
						|  jianjun | 7d1af6c758 | 部署statis report user ext | 5 years ago | 
				
					
						|  jianjun | 50d5896ced | Merge remote-tracking branch 'remotes/origin/dev' | 5 years ago | 
				
					
						|  jianjun | 9127e2163b | Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev # Conflicts:
#	epmet-gateway/pom.xml
#	epmet-module/epmet-ext/epmet-ext-server/pom.xml
#	epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-third/epmet-third-server/pom.xml
#	epmet-module/gov-access/gov-access-server/pom.xml
#	epmet-module/oper-customize/oper-customize-server/pom.xml
#	epmet-user/epmet-user-server/pom.xml | 5 years ago | 
				
					
						|  yinzuomei | 68595ca048 | Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data | 5 years ago | 
				
					
						|  yinzuomei | 7d0166487e | test | 5 years ago | 
				
					
						|  zhaoqifeng | 5834534969 | 体验版gov-org升级 | 5 years ago | 
				
					
						|  zxc | 3635f20262 | 指标汇总计算 | 5 years ago | 
				
					
						|  sunyuchao | 63b360976a | 客户定制功能角色设置  服务升级 | 5 years ago | 
				
					
						|  sunyuchao | 27f0cd9132 | Merge branch 'dev_customize' into dev_temp # Conflicts:
#	epmet-module/resi-mine/resi-mine-server/pom.xml | 5 years ago | 
				
					
						|  wxz | bd87f46e47 | 版本升级 | 5 years ago | 
				
					
						|  sunyuchao | a7d133004f | 客户定制功能角色设置、查询;居民端、工作端角色列表查询 | 5 years ago | 
				
					
						|  wxz | 66b2395045 | 版本升级 | 5 years ago | 
				
					
						|  wxz | 42199ad85c | Merge branch 'dev_externalappauth' into dev_temp # Conflicts:
#	epmet-auth/pom.xml
#	epmet-gateway/pom.xml
#	epmet-module/epmet-common-service/common-service-server/pom.xml
#	epmet-module/epmet-ext/epmet-ext-server/pom.xml
#	epmet-module/epmet-heart/epmet-heart-server/pom.xml
#	epmet-module/gov-access/gov-access-server/pom.xml
#	epmet-module/gov-mine/gov-mine-server/pom.xml
#	epmet-module/gov-org/gov-org-server/pom.xml
#	epmet-module/oper-access/oper-access-server/pom.xml
#	epmet-module/oper-crm/oper-crm-server/pom.xml
#	epmet-module/oper-customize/oper-customize-server/pom.xml
#	epmet-module/resi-partymember/resi-partymember-server/pom.xml
#	epmet-user/epmet-user-server/pom.xml | 5 years ago | 
				
					
						|  zhaoqifeng | c51ba3d876 | gov-org升级 | 5 years ago |