zxc
							
						 | 
						
							
							
							
								
							
								c396fc3377
								
							
								
							
						 | 
						
							
							
								
								jiedao
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								fa4688a0e6
								
							
								
							
						 | 
						
							
							
								
								入参修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								eb51561ef2
								
							
								
							
						 | 
						
							
							
								
								社区
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b99eac931b
								
							
								
							
						 | 
						
							
							
								
								区直部门-治理能力修改end1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5a7c25a69a
								
							
								
							
						 | 
						
							
							
								
								网格相关,分值计算修改end1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0a84c7e0f7
								
							
								
							
						 | 
						
							
							
								
								党员相关-党建能力分数计算修改end1
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4ff8195339
								
							
								
							
						 | 
						
							
							
								
								指标计算入口,入参CalculateCommonFormDTO统一添加customerAreaCode、subCustomerIds: processPenddingCalculate
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								145d8073d5
								
							
								
							
						 | 
						
							
							
								
								指标计算入口,入参CalculateCommonFormDTO统一添加customerAreaCode、subCustomerIds
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5e1bdd35a3
								
							
								
							
						 | 
						
							
							
								
								五级指标表,新增分子、分母那些列改为decimal(14,6)
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dde4d387e9
								
							
								
							
						 | 
						
							
							
								
								五级指标表,新增分子、分母那些列默认值设0
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fb07d8caa9
								
							
								
							
						 | 
						
							
							
								
								statis新增问题记录
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c1c20ea005
								
							
								
							
						 | 
						
							
							
								
								dim_customer增加列area_code、screen_customer_agency/dept/grid增加列up_to_cal、新增customer_relation表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5c5d610f38
								
							
								
							
						 | 
						
							
							
								
								dimCustomer初始化添加areaCode
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8b6aec63ae
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_areaCode
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								65b9176e25
								
							
								
							
						 | 
						
							
							
								
								行政地区编码查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								613bcc0322
								
							
								
							
						 | 
						
							
							
								
								行政地区编码查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								bb94ed8733
								
							
								
							
						 | 
						
							
							
								
								行政地区编码查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c0b9a187c3
								
							
								
							
						 | 
						
							
							
								
								行政地区编码查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								64ef3715d6
								
							
								
							
						 | 
						
							
							
								
								行政地区编码查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7ac6155b98
								
							
								
							
						 | 
						
							
							
								
								行政地区编码查询
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								3918015975
								
							
								
							
						 | 
						
							
							
								
								大屏数据采集 - v2升级新增字段 - entity
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhangyongzhangyong
							
						 | 
						
							
							
							
								
							
								be1ceac10f
								
							
								
							
						 | 
						
							
							
								
								大屏数据采集 - v2升级新增字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e588e8b193
								
							
								
							
						 | 
						
							
							
								
								新表对应生成文件上传
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3f93adb75c
								
							
								
							
						 | 
						
							
							
								
								少包
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ce79ec7ec0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_graceful_shutdown' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5ba1f09ff2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_project_branch' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8e7277bdc0
								
							
								
							
						 | 
						
							
							
								
								已转项目修改排序
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								32a59e5a44
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_thirdplatform' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								liushaowen
							
						 | 
						
							
							
							
								
							
								91b20d3821
								
							
								
							
						 | 
						
							
							
								
								模板列表
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								41b14f9a72
								
							
								
							
						 | 
						
							
							
								
								数据模块-先进支部排行接口调整  名称为组织-网格
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d357d59631
								
							
								
							
						 | 
						
							
							
								
								monthindexanalysis/barchart,横坐标修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								401b8a3d1c
								
							
								
							
						 | 
						
							
							
								
								monthindexanalysis/barchart接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								54eb1ebac0
								
							
								
							
						 | 
						
							
							
								
								指数查询接口修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								af9fce892f
								
							
								
							
						 | 
						
							
							
								
								议题-全部修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e9639888f2
								
							
								
							
						 | 
						
							
							
								
								待审核添加 issueApplicationId
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1061683468
								
							
								
							
						 | 
						
							
							
								
								已转项目添加 issueTitle
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								30f87ce08c
								
							
								
							
						 | 
						
							
							
								
								议题总数修改,议题审核被拒绝修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4921fda5bc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								857cb7137f
								
							
								
							
						 | 
						
							
							
								
								议题总数修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								918162bafd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_oss_private' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b779d862b7
								
							
								
							
						 | 
						
							
							
								
								修改:修改错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								41a98879a4
								
							
								
							
						 | 
						
							
							
								
								修改:补充
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								617f742239
								
							
								
							
						 | 
						
							
							
								
								审核ID添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e32d873ef2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_oss_private' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b9057df5c7
								
							
								
							
						 | 
						
							
							
								
								修改:在前端无法做oss私有链接适配的情况下,暂且使用/internal目录来区分私有文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f7930cec33
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								e7a967a75f
								
							
								
							
						 | 
						
							
							
								
								消息订阅返回错误修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d563968737
								
							
								
							
						 | 
						
							
							
								
								修改:使用阿里云私有bucket存储项目附件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2aca0a1c3c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_oss_private' into dev_project_branch
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-gateway/pom.xml
#	epmet-gateway/src/main/resources/bootstrap.yml
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java
#	epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5cf29ece5d
								
							
								
							
						 | 
						
							
							
								
								新增阿里云oss 的私有和公有bucket访问相关代码
							
							
							
							
								
							
							
						 | 
						5 years ago |